diff --git a/dtool/Config.pp b/dtool/Config.pp
index 4147890ae8..4fa287515b 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -278,7 +278,7 @@
 // How about GLX?
 #define GLX_IPATH
 #define GLX_LPATH
-#defer HAVE_GLX $[HAVE_GL]
+#defer HAVE_WGL $[and $[HAVE_GL],$[UNIX_PLATFORM]]
 
 // Glut?
 #define GLUT_IPATH
@@ -298,7 +298,7 @@
 #if $[WINDOWS_PLATFORM]
   #define DX_IPATH
   #define DX_LPATH
-  #define DX_LIBS ddraw.lib dxguid.lib
+  #define DX_LIBS d3d8.lib d3dx8.lib dxerr8.lib
   #defer HAVE_DX $[libtest $[DX_LPATH],$[DX_LIBS]]
 #endif
 
diff --git a/panda/metalibs/pandadx/Sources.pp b/panda/metalibs/pandadx/Sources.pp
index a34bdf446c..7dc2dfd153 100644
--- a/panda/metalibs/pandadx/Sources.pp
+++ b/panda/metalibs/pandadx/Sources.pp
@@ -18,6 +18,6 @@
   #define TARGET pandadx7
   #define SOURCES pandadx.cxx  
   #define WIN_SYS_LIBS \
-     ddraw.lib d3dim.lib dxguid.lib winmm.lib \
+     ddraw.lib dxguid.lib winmm.lib \
      kernel32.lib gdi32.lib user32.lib $[WIN_SYS_LIBS]
 #end metalib_target
diff --git a/panda/metalibs/pandadx8/Sources.pp b/panda/metalibs/pandadx8/Sources.pp
index 9236482f01..443cd0dd27 100644
--- a/panda/metalibs/pandadx8/Sources.pp
+++ b/panda/metalibs/pandadx8/Sources.pp
@@ -18,7 +18,7 @@
   #define TARGET pandadx
   #define SOURCES pandadx8.cxx
   #define WIN_SYS_LIBS \
-     ddraw.lib d3d8.lib dxguid.lib d3dx8.lib dxerr8.lib winmm.lib \
+     ddraw.lib dxguid.lib winmm.lib \
      kernel32.lib gdi32.lib user32.lib advapi32.lib $[WIN_SYS_LIBS]  
 #end metalib_target