diff --git a/direct/src/ffi/FFIExternalObject.py b/direct/src/ffi/FFIExternalObject.py
index 5833225f94..e93fde9223 100644
--- a/direct/src/ffi/FFIExternalObject.py
+++ b/direct/src/ffi/FFIExternalObject.py
@@ -19,8 +19,8 @@ DowncastMap = {}
 # The type map is used for upcasting and downcasting through
 # the panda inheritance chain
 def registerInTypeMap(pythonClass):
-    from pandac.PandaModules import TypedObject
-    if issubclass(pythonClass, TypedObject):
+    from pandac import TypedObject
+    if issubclass(pythonClass, TypedObject.TypedObject):
         typeIndex = pythonClass.getClassType().getIndex()
         WrapperClassMap[typeIndex] = pythonClass
 
@@ -210,8 +210,8 @@ class FFIExternalObject:
         # We create a LineStream for the output function to write to, then we extract
         # the string out of it and return it as our str
         try:
-            from pandac.PandaModules import LineStream
-            lineStream = LineStream()
+            from pandac import LineStream
+            lineStream = LineStream.LineStream()
             self.output(lineStream)
             baseRepr = lineStream.getLine()
         except AssertionError, e:
@@ -229,8 +229,8 @@ class FFIExternalObject:
         # Lots of Panda classes have an write or output function defined that takes an Ostream
         # We create a LineStream for the write or output function to write to, then we extract
         # the string out of it and return it as our repr
-        from pandac.PandaModules import LineStream
-        lineStream = LineStream()
+        from pandac import LineStream
+        lineStream = LineStream.LineStream()
         try:
             # First try the write function, that is the better one
             self.write(lineStream)