diff --git a/Makefile b/Makefile
index 1147210..ba2ed6d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,30 +4,7 @@ TARGET   ?= ddraw.dll
 
 LDFLAGS  ?= -Wl,--enable-stdcall-fixup -s -static -shared
 CFLAGS   ?= -Iinc -O2 -Wall -std=c99 -Wno-incompatible-pointer-types
-LIBS      = -lgdi32 -lwinmm -lole32 -lMsimg32 -lPsapi
-
-COMMIT   := $(shell git describe --match=NeVeRmAtCh --always --dirty || echo UNKNOWN)
-BRANCH   := $(shell git rev-parse --abbrev-ref HEAD || echo UNKNOWN)
-
-ECHOTEST := $(shell echo \"\")
-ifeq ($(ECHOTEST),\"\")
-	# Windows
-	HASH     := \#
-	ECOMMIT  := $(shell echo $(HASH)define GIT_COMMIT "$(COMMIT)" > inc/git.h)
-	EBRANCH  := $(shell echo $(HASH)define GIT_BRANCH "$(BRANCH)" >> inc/git.h)
-else
-	# Either *nix or Windows with BusyBox (e.g. w64devkit)
-	ECOMMIT  := $(shell echo "#define GIT_COMMIT" \"$(COMMIT)\" > inc/git.h)
-	EBRANCH  := $(shell echo "#define GIT_BRANCH" \"$(BRANCH)\" >> inc/git.h)
-endif
-
-ifdef DEBUG
-	CFLAGS   += -D _DEBUG -D _DEBUG_X
-endif
-
-ifdef _WIN32_WINNT
-	CFLAGS   += -march=i486 -D _WIN32_WINNT=$(_WIN32_WINNT)
-endif
+LIBS      = -lgdi32 -lwinmm -lole32 -lmsimg32 -lpsapi
 
 CC        = i686-w64-mingw32-gcc
 WINDRES  ?= i686-w64-mingw32-windres
diff --git a/src/render_d3d9.c b/src/render_d3d9.c
index cae506b..8898df4 100644
--- a/src/render_d3d9.c
+++ b/src/render_d3d9.c
@@ -10,7 +10,7 @@
 #include "wndproc.h"
 #include "blt.h"
 #include "debug.h"
-#include "D3d9types.h"
+#include "d3d9types.h"
 #include "hook.h"
 #include "config.h"