diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index eb490bb8ae6..e4bc35c73f2 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -5,8 +5,7 @@ VPATH     = @srcdir@
 MODULE    = d3d8.dll
 IMPORTLIB = libd3d8.$(IMPLIBEXT)
 IMPORTS   = wined3d user32 gdi32 advapi32 kernel32
-EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	basetexture.c \
diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index f90c53e5ce5..7b7ebf53c8a 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -23,19 +23,6 @@
 #ifndef __WINE_D3D8_PRIVATE_H
 #define __WINE_D3D8_PRIVATE_H
 
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#undef APIENTRY
-#undef CALLBACK
-#undef WINAPI
-
-/* Redefines the constants */
-#define CALLBACK    __stdcall
-#define WINAPI      __stdcall
-#define APIENTRY    WINAPI
-
 #include <stdarg.h>
 
 #define NONAMELESSUNION