diff --git a/panda/src/text/geomTextGlyph.h b/panda/src/text/geomTextGlyph.h
index 1e922666bc..a49ae582a7 100644
--- a/panda/src/text/geomTextGlyph.h
+++ b/panda/src/text/geomTextGlyph.h
@@ -16,10 +16,10 @@
 #define GEOMTEXTGLYPH_H
 
 #include "pandabase.h"
+#include "geom.h"
 
 #ifdef HAVE_FREETYPE
 
-#include "geom.h"
 #include "dynamicTextGlyph.h"
 
 ////////////////////////////////////////////////////////////////////
@@ -77,6 +77,11 @@ private:
 
 #include "geomTextGlyph.I"
 
+#else  // HAVE_FREETYPE
+
+// Without Freetype, a GeomTextGlyph is really just an ordinary Geom.
+typedef Geom GeomTextGlyph;
+
 #endif  // HAVE_FREETYPE
 
 #endif // GEOMTEXTGLYPH_H
diff --git a/panda/src/text/textAssembler.I b/panda/src/text/textAssembler.I
index fb50c42026..b780efdf2f 100644
--- a/panda/src/text/textAssembler.I
+++ b/panda/src/text/textAssembler.I
@@ -558,5 +558,7 @@ operator < (const TextAssembler::GeomCollectorKey &other) const {
 ////////////////////////////////////////////////////////////////////
 INLINE void TextAssembler::GeomCollector::
 count_geom(const Geom *geom) {
+#ifdef HAVE_FREETYPE
   _geom->count_geom(geom);
+#endif
 }