diff --git a/panda/src/display/graphicsDevice.h b/panda/src/display/graphicsDevice.h
index 5b6799609c..9a22524b72 100755
--- a/panda/src/display/graphicsDevice.h
+++ b/panda/src/display/graphicsDevice.h
@@ -21,10 +21,10 @@
 
 #include "pandabase.h"
 
-#include "graphicsPipe.h"
-#include "graphicsStateGuardian.h"
-
 #include "typedReferenceCount.h"
+
+class GraphicsPipe;
+
 ////////////////////////////////////////////////////////////////////
 //       Class : GraphicsDevice
 // Description : An abstract device object that is part of Graphics
@@ -48,7 +48,7 @@ PUBLISHED:
   INLINE GraphicsPipe *get_pipe() const;
 
 protected:
-  PT(GraphicsPipe) _pipe;
+  GraphicsPipe *_pipe;
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/display/graphicsPipe.h b/panda/src/display/graphicsPipe.h
index 1f89213b99..743db1831e 100644
--- a/panda/src/display/graphicsPipe.h
+++ b/panda/src/display/graphicsPipe.h
@@ -21,6 +21,7 @@
 
 #include "pandabase.h"
 
+#include "graphicsDevice.h"
 #include "typedReferenceCount.h"
 #include "pointerTo.h"
 #include "pmutex.h"
@@ -28,7 +29,6 @@
 
 class HardwareChannel;
 class GraphicsWindow;
-class GraphicsDevice;
 class GraphicsStateGuardian;
 class FrameBufferProperties;