diff --git a/panda/src/graph/allAttributesWrapper.h b/panda/src/graph/allAttributesWrapper.h
index 4a5714dff9..df15013466 100644
--- a/panda/src/graph/allAttributesWrapper.h
+++ b/panda/src/graph/allAttributesWrapper.h
@@ -63,7 +63,7 @@ INLINE_GRAPH ostream &operator << (ostream &out, const AllAttributesWrapper &a);
 
 #include "allAttributesWrapper.T"
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "allAttributesWrapper.I"
 #endif
 
diff --git a/panda/src/graph/allTransitionsWrapper.h b/panda/src/graph/allTransitionsWrapper.h
index f909bf7f9a..7f40493c4a 100644
--- a/panda/src/graph/allTransitionsWrapper.h
+++ b/panda/src/graph/allTransitionsWrapper.h
@@ -119,7 +119,7 @@ INLINE_GRAPH ostream &operator << (ostream &out, const AllTransitionsWrapper &nt
 
 #include "allTransitionsWrapper.T"
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "allTransitionsWrapper.I"
 #endif
 
diff --git a/panda/src/graph/arcChain.h b/panda/src/graph/arcChain.h
index bee1a0a83e..0525ab3663 100644
--- a/panda/src/graph/arcChain.h
+++ b/panda/src/graph/arcChain.h
@@ -139,7 +139,7 @@ private:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const ArcChain &arc_chain);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "arcChain.I"
 #endif
 
diff --git a/panda/src/graph/boundedObject.h b/panda/src/graph/boundedObject.h
index 309d868890..e9e331534f 100644
--- a/panda/src/graph/boundedObject.h
+++ b/panda/src/graph/boundedObject.h
@@ -63,7 +63,7 @@ private:
   static TypeHandle _type_handle;
 };
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "boundedObject.I"
 #endif
 
diff --git a/panda/src/graph/immediateTransition.h b/panda/src/graph/immediateTransition.h
index 80a830e46c..3221a46ccb 100644
--- a/panda/src/graph/immediateTransition.h
+++ b/panda/src/graph/immediateTransition.h
@@ -75,7 +75,7 @@ private:
   static TypeHandle _type_handle;
 };
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "immediateTransition.I"
 #endif
 
diff --git a/panda/src/graph/multiTransitionHelpers.h b/panda/src/graph/multiTransitionHelpers.h
index ce65d965fb..a3860807ae 100644
--- a/panda/src/graph/multiTransitionHelpers.h
+++ b/panda/src/graph/multiTransitionHelpers.h
@@ -124,7 +124,7 @@ bmap_apply(InputIterator1 first1, InputIterator1 last1,
 	   bool complete_transition, TransitionDirection want_dirs,
 	   OutputIterator result);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "multiTransitionHelpers.I"
 #endif
 
diff --git a/panda/src/graph/namedNode.h b/panda/src/graph/namedNode.h
index 7f5e6efbb4..89d3a4a2cd 100644
--- a/panda/src/graph/namedNode.h
+++ b/panda/src/graph/namedNode.h
@@ -58,7 +58,7 @@ private:
 // or Namable) that NamedNode uses.
 EXPCL_PANDA INLINE_GRAPH ostream & operator << (ostream &out, const NamedNode &nod);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "namedNode.I"
 #endif
 
diff --git a/panda/src/graph/node.h b/panda/src/graph/node.h
index ef9594e096..dae9fb284b 100644
--- a/panda/src/graph/node.h
+++ b/panda/src/graph/node.h
@@ -149,7 +149,7 @@ find_arc(Node *parent, Node *child, TypeHandle graph_type);
 EXPCL_PANDA INLINE_GRAPH bool
 remove_child(Node *parent, Node *child, TypeHandle graph_type);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "node.I"
 #endif
 
diff --git a/panda/src/graph/nodeAttribute.h b/panda/src/graph/nodeAttribute.h
index 9f95127000..9140d629f4 100644
--- a/panda/src/graph/nodeAttribute.h
+++ b/panda/src/graph/nodeAttribute.h
@@ -101,7 +101,7 @@ private:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NodeAttribute &nab);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeAttribute.I"
 #endif
 
diff --git a/panda/src/graph/nodeAttributeWrapper.h b/panda/src/graph/nodeAttributeWrapper.h
index e0091bd22d..da93cb6e11 100644
--- a/panda/src/graph/nodeAttributeWrapper.h
+++ b/panda/src/graph/nodeAttributeWrapper.h
@@ -51,7 +51,7 @@ INLINE_GRAPH ostream &operator << (ostream &out, const NodeAttributeWrapper &naw
 
 #include "nodeAttributeWrapper.T"
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeAttributeWrapper.I"
 #endif
 
diff --git a/panda/src/graph/nodeAttributes.h b/panda/src/graph/nodeAttributes.h
index f249270dbc..8edc2e7072 100644
--- a/panda/src/graph/nodeAttributes.h
+++ b/panda/src/graph/nodeAttributes.h
@@ -83,7 +83,7 @@ INLINE_GRAPH ostream &operator << (ostream &out, const NodeAttributes &nas);
 
 #include "nodeAttributes.T"
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeAttributes.I"
 #endif
 
diff --git a/panda/src/graph/nodeRelation.h b/panda/src/graph/nodeRelation.h
index 0942c88009..f0fdf67833 100644
--- a/panda/src/graph/nodeRelation.h
+++ b/panda/src/graph/nodeRelation.h
@@ -230,7 +230,7 @@ typedef map<TypeHandle, UpRelationPointers> UpRelations;
 
 #include "nodeRelation.T"
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeRelation.I"
 #endif
 
diff --git a/panda/src/graph/nodeTransition.h b/panda/src/graph/nodeTransition.h
index 6d7ad7e344..5b3a856109 100644
--- a/panda/src/graph/nodeTransition.h
+++ b/panda/src/graph/nodeTransition.h
@@ -126,7 +126,7 @@ private:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NodeTransition &ntb);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeTransition.I"
 #endif
 
diff --git a/panda/src/graph/nodeTransitionCache.h b/panda/src/graph/nodeTransitionCache.h
index 5660ef5e29..c2f0bb721b 100644
--- a/panda/src/graph/nodeTransitionCache.h
+++ b/panda/src/graph/nodeTransitionCache.h
@@ -102,7 +102,7 @@ private:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NodeTransitionCache &ntc);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeTransitionCache.I"
 #endif
 
diff --git a/panda/src/graph/nodeTransitionCacheEntry.h b/panda/src/graph/nodeTransitionCacheEntry.h
index bd8f1e2771..dae7e6b7c9 100644
--- a/panda/src/graph/nodeTransitionCacheEntry.h
+++ b/panda/src/graph/nodeTransitionCacheEntry.h
@@ -85,7 +85,7 @@ private:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NodeTransitionCacheEntry &e);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeTransitionCacheEntry.I"
 #endif
 
diff --git a/panda/src/graph/nodeTransitionWrapper.h b/panda/src/graph/nodeTransitionWrapper.h
index 135f0d54b0..e2c997c654 100644
--- a/panda/src/graph/nodeTransitionWrapper.h
+++ b/panda/src/graph/nodeTransitionWrapper.h
@@ -84,7 +84,7 @@ private:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NodeTransitionWrapper &ntw);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeTransitionWrapper.I"
 #endif
 
diff --git a/panda/src/graph/nodeTransitions.h b/panda/src/graph/nodeTransitions.h
index c514abfb81..63c0a4f0b2 100644
--- a/panda/src/graph/nodeTransitions.h
+++ b/panda/src/graph/nodeTransitions.h
@@ -75,7 +75,7 @@ private:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NodeTransitions &nts);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nodeTransitions.I"
 #endif
 
diff --git a/panda/src/graph/nullAttributeWrapper.h b/panda/src/graph/nullAttributeWrapper.h
index 837955b4f5..c423f34ce1 100644
--- a/panda/src/graph/nullAttributeWrapper.h
+++ b/panda/src/graph/nullAttributeWrapper.h
@@ -42,7 +42,7 @@ public:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NullAttributeWrapper &naw);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nullAttributeWrapper.I"
 #endif
 
diff --git a/panda/src/graph/nullTransitionWrapper.h b/panda/src/graph/nullTransitionWrapper.h
index 759a5ad84c..5cd8878646 100644
--- a/panda/src/graph/nullTransitionWrapper.h
+++ b/panda/src/graph/nullTransitionWrapper.h
@@ -77,7 +77,7 @@ public:
 
 INLINE_GRAPH ostream &operator << (ostream &out, const NullTransitionWrapper &ntw);
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "nullTransitionWrapper.I"
 #endif
 
diff --git a/panda/src/graph/onOffAttribute.h b/panda/src/graph/onOffAttribute.h
index ca82ed7ee6..227a3f14c4 100644
--- a/panda/src/graph/onOffAttribute.h
+++ b/panda/src/graph/onOffAttribute.h
@@ -63,7 +63,7 @@ private:
 friend class OnOffTransition;
 };
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "onOffAttribute.I"
 #endif
 
diff --git a/panda/src/graph/onOffTransition.h b/panda/src/graph/onOffTransition.h
index edb86c1c51..ecd4f64200 100644
--- a/panda/src/graph/onOffTransition.h
+++ b/panda/src/graph/onOffTransition.h
@@ -95,7 +95,7 @@ private:
   friend class OnOffAttribute;
 };
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "onOffTransition.I"
 #endif
 
diff --git a/panda/src/graph/onTransition.h b/panda/src/graph/onTransition.h
index 463a007bec..f455d18b7a 100644
--- a/panda/src/graph/onTransition.h
+++ b/panda/src/graph/onTransition.h
@@ -75,7 +75,7 @@ private:
   friend class OnAttribute;
 };
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "onTransition.I"
 #endif
 
diff --git a/panda/src/graph/wrt.h b/panda/src/graph/wrt.h
index 007ae19287..93a2ff824d 100644
--- a/panda/src/graph/wrt.h
+++ b/panda/src/graph/wrt.h
@@ -128,7 +128,7 @@ wrt_subtree(NodeRelation *arc, Node *to, UpdateSeq as_of, UpdateSeq now,
 	    TransitionWrapper &result, TypeHandle graph_type);
 
 
-#ifdef BUILDING_PANDA
+#ifndef DONT_INLINE_GRAPH
 #include "wrt.I"
 #endif
 
diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h
index c5f0e77ab3..0b986c7c78 100644
--- a/panda/src/pandabase/pandasymbols.h
+++ b/panda/src/pandabase/pandasymbols.h
@@ -126,6 +126,7 @@
 #define INLINE_GRAPH __forceinline
 #else
 #define INLINE_GRAPH
+#define DONT_INLINE_GRAPH
 #endif
 
 #else