diff --git a/panda/src/device/analogNode.cxx b/panda/src/device/analogNode.cxx
index 2c9d983734..29c94d0831 100644
--- a/panda/src/device/analogNode.cxx
+++ b/panda/src/device/analogNode.cxx
@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "analogNode.h"
+#include "config_device.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////
 // Static variables
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/device/buttonNode.cxx b/panda/src/device/buttonNode.cxx
index 3bf3a88aa6..b4c7598214 100644
--- a/panda/src/device/buttonNode.cxx
+++ b/panda/src/device/buttonNode.cxx
@@ -16,9 +16,19 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "buttonNode.h"
+#include "config_device.h"
+#endif
+
+#include <buttonEventDataTransition.h>
+
 ////////////////////////////////////////////////////////////////////
 // Static variables
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/device/clientAnalogDevice.cxx b/panda/src/device/clientAnalogDevice.cxx
index 0af78e1ac2..0e576ce2a3 100644
--- a/panda/src/device/clientAnalogDevice.cxx
+++ b/panda/src/device/clientAnalogDevice.cxx
@@ -16,9 +16,18 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "clientAnalogDevice.h"
+
+#include <indent.h>
+#endif
+
 TypeHandle ClientAnalogDevice::_type_handle;
 
 
diff --git a/panda/src/device/clientBase.cxx b/panda/src/device/clientBase.cxx
index 132fcb081b..9ef16e84d5 100644
--- a/panda/src/device/clientBase.cxx
+++ b/panda/src/device/clientBase.cxx
@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "clientBase.h"
+#include "config_device.h"
+#endif
+
 TypeHandle ClientBase::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/device/clientButtonDevice.cxx b/panda/src/device/clientButtonDevice.cxx
index 46e5d04292..0bce14ff03 100644
--- a/panda/src/device/clientButtonDevice.cxx
+++ b/panda/src/device/clientButtonDevice.cxx
@@ -16,9 +16,18 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "clientButtonDevice.h"
+
+#include <indent.h>
+#endif
+
 TypeHandle ClientButtonDevice::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/device/clientDevice.cxx b/panda/src/device/clientDevice.cxx
index f5ca6b8342..de77e36733 100644
--- a/panda/src/device/clientDevice.cxx
+++ b/panda/src/device/clientDevice.cxx
@@ -16,9 +16,19 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "clientDevice.h"
+#include "clientBase.h"
+
+#include <indent.h>
+#endif
+
 TypeHandle ClientDevice::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/device/clientDialDevice.cxx b/panda/src/device/clientDialDevice.cxx
index 7f40140723..f2130e59bc 100644
--- a/panda/src/device/clientDialDevice.cxx
+++ b/panda/src/device/clientDialDevice.cxx
@@ -16,9 +16,18 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "clientDialDevice.h"
+
+#include <indent.h>
+#endif
+
 TypeHandle ClientDialDevice::_type_handle;
 
 
diff --git a/panda/src/device/clientTrackerDevice.cxx b/panda/src/device/clientTrackerDevice.cxx
index f7e44524e4..9c208edcdb 100644
--- a/panda/src/device/clientTrackerDevice.cxx
+++ b/panda/src/device/clientTrackerDevice.cxx
@@ -16,7 +16,14 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "clientTrackerDevice.h"
+#endif
+
 TypeHandle ClientTrackerDevice::_type_handle;
diff --git a/panda/src/device/config_device.cxx b/panda/src/device/config_device.cxx
index a5019a3497..8d667dd222 100644
--- a/panda/src/device/config_device.cxx
+++ b/panda/src/device/config_device.cxx
@@ -16,9 +16,29 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "config_device.h"
+#include "analogNode.h"
+#include "buttonNode.h"
+#include "clientAnalogDevice.h"
+#include "clientBase.h"
+#include "clientButtonDevice.h"
+#include "clientDevice.h"
+#include "clientDialDevice.h"
+#include "clientTrackerDevice.h"
+#include "dialNode.h"
+#include "mouse.h"
+#include "trackerNode.h"
+#endif
+
+#include <dconfig.h>
+
 Configure(config_device);
 NotifyCategoryDef(device, "");
 
diff --git a/panda/src/device/device_headers.h b/panda/src/device/device_headers.h
index 86ba57410b..d15fbd3762 100644
--- a/panda/src/device/device_headers.h
+++ b/panda/src/device/device_headers.h
@@ -16,12 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include <buttonEvent.h>
-#include <buttonEventDataTransition.h>
-#include <buttonHandle.h>
-#include <dconfig.h>
 #include <indent.h>
-#include <mouseData.h>
 
 #include "analogNode.h"
 #include "buttonNode.h"
@@ -34,7 +29,6 @@
 #include "config_device.h"
 #include "dialNode.h"
 #include "mouse.h"
-#include "trackerData.h"
 #include "trackerNode.h"
 
 #pragma hdrstop
diff --git a/panda/src/device/dialNode.cxx b/panda/src/device/dialNode.cxx
index 6855aa8d0c..6a29393acb 100644
--- a/panda/src/device/dialNode.cxx
+++ b/panda/src/device/dialNode.cxx
@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "dialNode.h"
+#include "config_device.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////
 // Static variables
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/device/mouse.cxx b/panda/src/device/mouse.cxx
index 68d776600c..0e698f9ccd 100644
--- a/panda/src/device/mouse.cxx
+++ b/panda/src/device/mouse.cxx
@@ -15,9 +15,20 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "mouse.h"
+#endif
+
+#include <mouseData.h>
+#include <buttonHandle.h>
+#include <buttonEvent.h>
+
 ////////////////////////////////////////////////////////////////////
 // Static variables
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/device/trackerData.cxx b/panda/src/device/trackerData.cxx
index b3a2fb4467..71de797ba3 100644
--- a/panda/src/device/trackerData.cxx
+++ b/panda/src/device/trackerData.cxx
@@ -16,9 +16,14 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#include "trackerData.h"
+
 ////////////////////////////////////////////////////////////////////
 //     Function: TrackerData::Copy Assignment Operator
 //       Access: Public
diff --git a/panda/src/device/trackerNode.cxx b/panda/src/device/trackerNode.cxx
index ae8731066a..362d878567 100644
--- a/panda/src/device/trackerNode.cxx
+++ b/panda/src/device/trackerNode.cxx
@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "device_headers.h"
+#endif
+
 #pragma hdrstop
 
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "trackerNode.h"
+#include "config_device.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////
 // Static variables
 ////////////////////////////////////////////////////////////////////