diff --git a/direct/src/plugin/p3d_plugin_common.h b/direct/src/plugin/p3d_plugin_common.h
index 84443de526..ce40837f93 100644
--- a/direct/src/plugin/p3d_plugin_common.h
+++ b/direct/src/plugin/p3d_plugin_common.h
@@ -23,14 +23,14 @@
 #define BUILDING_P3D_PLUGIN
 #define TIXML_USE_STL
 
-#include "p3d_plugin.h"
-#include "p3d_lock.h"
-
 // It's a good idea to pick up this header file, even though we don't
 // actually link with dtool.  This header file defines useful
 // system-wide config settings.
 #include "dtool_config.h"
 
+#include "p3d_plugin.h"
+#include "p3d_lock.h"
+
 #include <iostream>
 #include <fstream>
 #include <string>
diff --git a/direct/src/plugin_npapi/Sources.pp b/direct/src/plugin_npapi/Sources.pp
index ce800e6936..35b0098510 100644
--- a/direct/src/plugin_npapi/Sources.pp
+++ b/direct/src/plugin_npapi/Sources.pp
@@ -12,12 +12,6 @@
 
   #define LOCAL_LIBS plugin_common
 
-  // We need this because we don't
-  // include dtool_config.h.
-  #if $[HAVE_X11]
-    #define EXTRA_CDEFS HAVE_X11
-  #endif
-
   #define COMBINED_SOURCES \
     $[TARGET]_composite1.cxx
 
diff --git a/direct/src/plugin_npapi/nppanda3d_common.h b/direct/src/plugin_npapi/nppanda3d_common.h
index 0d06b65311..063c9bcd6a 100644
--- a/direct/src/plugin_npapi/nppanda3d_common.h
+++ b/direct/src/plugin_npapi/nppanda3d_common.h
@@ -17,6 +17,11 @@
 
 // This header file is included by all C++ files in this directory
 
+// It's a good idea to pick up this header file, even though we don't
+// actually link with dtool.  This header file defines useful
+// system-wide config settings.
+#include "dtool_config.h"
+
 // We include this header file directly out of its source directory,
 // so we don't have to link with the library that builds it.
 #include "../plugin/p3d_plugin.h"