diff --git a/panda/src/display/graphicsStateGuardian.I b/panda/src/display/graphicsStateGuardian.I
index 31faa85ef4..ce54db6881 100644
--- a/panda/src/display/graphicsStateGuardian.I
+++ b/panda/src/display/graphicsStateGuardian.I
@@ -961,7 +961,7 @@ get_current_lens() const {
 //  Description: Returns the inverse of the transform returned by
 //               get_cs_transform().
 ////////////////////////////////////////////////////////////////////
-INLINE const TransformState *GraphicsStateGuardian::
+INLINE CPT(TransformState) GraphicsStateGuardian::
 get_inv_cs_transform() const {
   return _inv_cs_transform;
 }
diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx
index 256a8bc975..6694dabf9c 100644
--- a/panda/src/display/graphicsStateGuardian.cxx
+++ b/panda/src/display/graphicsStateGuardian.cxx
@@ -1889,7 +1889,7 @@ get_render_buffer(int buffer_type, const FrameBufferProperties &prop) {
 //               scene for a camera with the indicated coordinate
 //               system.
 ////////////////////////////////////////////////////////////////////
-const TransformState *GraphicsStateGuardian::
+CPT(TransformState) GraphicsStateGuardian::
 get_cs_transform_for(CoordinateSystem cs) const {
   if (_internal_coordinate_system == CS_default ||
       _internal_coordinate_system == cs) {
@@ -1911,7 +1911,7 @@ get_cs_transform_for(CoordinateSystem cs) const {
 //               get_internal_coordinate_system()).  This is used for
 //               rendering.
 ////////////////////////////////////////////////////////////////////
-const TransformState *GraphicsStateGuardian::
+CPT(TransformState) GraphicsStateGuardian::
 get_cs_transform() const {
   return _cs_transform;
 }
diff --git a/panda/src/display/graphicsStateGuardian.h b/panda/src/display/graphicsStateGuardian.h
index 785d6babc3..ce2c41bc93 100644
--- a/panda/src/display/graphicsStateGuardian.h
+++ b/panda/src/display/graphicsStateGuardian.h
@@ -300,9 +300,9 @@ public:
   INLINE int get_current_tex_view_offset() const;
   INLINE const Lens *get_current_lens() const;
 
-  virtual const TransformState *get_cs_transform_for(CoordinateSystem cs) const;
-  virtual const TransformState *get_cs_transform() const;
-  INLINE const TransformState *get_inv_cs_transform() const;
+  virtual CPT(TransformState) get_cs_transform_for(CoordinateSystem cs) const;
+  virtual CPT(TransformState) get_cs_transform() const;
+  INLINE CPT(TransformState) get_inv_cs_transform() const;
 
   void do_issue_clip_plane();
   void do_issue_color();
diff --git a/panda/src/gsgbase/graphicsStateGuardianBase.h b/panda/src/gsgbase/graphicsStateGuardianBase.h
index 16e4003376..4977be3721 100644
--- a/panda/src/gsgbase/graphicsStateGuardianBase.h
+++ b/panda/src/gsgbase/graphicsStateGuardianBase.h
@@ -18,6 +18,7 @@
 #include "pandabase.h"
 
 #include "typedWritableReferenceCount.h"
+#include "nodeCachedReferenceCount.h"
 #include "luse.h"
 #include "lightMutex.h"
 
@@ -212,8 +213,6 @@ public:
   (Texture *tex, int z, const DisplayRegion *dr, const RenderBuffer &rb)=0;
   
   virtual CoordinateSystem get_internal_coordinate_system() const=0;
-  virtual const TransformState *get_cs_transform_for(CoordinateSystem cs) const=0;
-  virtual const TransformState *get_cs_transform() const=0;
 
   virtual void bind_light(PointLight *light_obj, const NodePath &light, 
                           int light_id) { }