diff --git a/direct/src/distributed/AstronClientRepository.py b/direct/src/distributed/AstronClientRepository.py
index aa33ec96b2..f7cf448236 100644
--- a/direct/src/distributed/AstronClientRepository.py
+++ b/direct/src/distributed/AstronClientRepository.py
@@ -4,7 +4,7 @@ from direct.directnotify import DirectNotifyGlobal
 from ClientRepositoryBase import ClientRepositoryBase
 from MsgTypes import *
 from direct.distributed.PyDatagram import PyDatagram
-from pandac.PandaModules import STUint16, STUint32
+from panda3d.direct import STUint16, STUint32
 
 class AstronClientRepository(ClientRepositoryBase):
     """
diff --git a/direct/src/distributed/AstronDatabaseInterface.py b/direct/src/distributed/AstronDatabaseInterface.py
index 32939aead0..127882c995 100644
--- a/direct/src/distributed/AstronDatabaseInterface.py
+++ b/direct/src/distributed/AstronDatabaseInterface.py
@@ -1,4 +1,4 @@
-from pandac.PandaModules import *
+from panda3d.direct import DCPacker
 from MsgTypes import *
 from direct.directnotify import DirectNotifyGlobal
 from ConnectionRepository import ConnectionRepository
diff --git a/direct/src/distributed/AstronInternalRepository.py b/direct/src/distributed/AstronInternalRepository.py
index ba06142a9f..1d61db09e5 100644
--- a/direct/src/distributed/AstronInternalRepository.py
+++ b/direct/src/distributed/AstronInternalRepository.py
@@ -1,4 +1,5 @@
-from pandac.PandaModules import *
+from panda3d.core import *
+from panda3d.direct import DCPacker
 from MsgTypes import *
 from direct.showbase import ShowBase # __builtin__.config
 from direct.task.TaskManagerGlobal import * # taskMgr
diff --git a/direct/src/distributed/DistributedCameraOV.py b/direct/src/distributed/DistributedCameraOV.py
index 82945de29e..1533776baa 100755
--- a/direct/src/distributed/DistributedCameraOV.py
+++ b/direct/src/distributed/DistributedCameraOV.py
@@ -1,4 +1,3 @@
-from pandac.PandaModules import *
 from direct.distributed.DistributedObjectOV import DistributedObjectOV
 
 class DistributedCameraOV(DistributedObjectOV):
diff --git a/direct/src/distributed/DistributedObjectUD.py b/direct/src/distributed/DistributedObjectUD.py
index ee56ba3f57..01be7d4d48 100755
--- a/direct/src/distributed/DistributedObjectUD.py
+++ b/direct/src/distributed/DistributedObjectUD.py
@@ -3,7 +3,6 @@
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObjectBase import DistributedObjectBase
 from direct.showbase import PythonUtil
-from pandac.PandaModules import *
 #from PyDatagram import PyDatagram
 #from PyDatagramIterator import PyDatagramIterator
 
diff --git a/direct/src/distributed/DistributedSmoothNode.py b/direct/src/distributed/DistributedSmoothNode.py
index 560fe2b6d8..83d39f7e6a 100644
--- a/direct/src/distributed/DistributedSmoothNode.py
+++ b/direct/src/distributed/DistributedSmoothNode.py
@@ -1,6 +1,7 @@
 """DistributedSmoothNode module: contains the DistributedSmoothNode class"""
 
-from pandac.PandaModules import *
+from panda3d.core import NodePath
+from panda3d.direct import SmoothMover
 from .ClockDelta import *
 from . import DistributedNode
 from . import DistributedSmoothNodeBase
diff --git a/direct/src/distributed/DoInterestManager.py b/direct/src/distributed/DoInterestManager.py
index 53022da73c..66d4449c58 100755
--- a/direct/src/distributed/DoInterestManager.py
+++ b/direct/src/distributed/DoInterestManager.py
@@ -7,7 +7,7 @@ zone, remove interest in that zone.
 p.s. A great deal of this code is just code moved from ClientRepository.py.
 """
 
-from pandac.PandaModules import *
+from panda3d.core import *
 from .MsgTypes import *
 from direct.showbase.PythonUtil import *
 from direct.showbase import DirectObject
diff --git a/direct/src/distributed/GridParent.py b/direct/src/distributed/GridParent.py
index 1fc9713897..0ce2ad2c3f 100755
--- a/direct/src/distributed/GridParent.py
+++ b/direct/src/distributed/GridParent.py
@@ -1,6 +1,3 @@
-
-from pandac.PandaModules import *
-
 #
 # GridParent.py
 # Any object that can be parented to the ocean grid
@@ -11,6 +8,8 @@ from pandac.PandaModules import *
 # that the object is broadcasting its position relative to the gridCell
 # it lies in.
 
+from panda3d.core import NodePath
+
 class GridParent:
 
     # this lets GridParents share CellOrigins
diff --git a/direct/src/distributed/ServerRepository.py b/direct/src/distributed/ServerRepository.py
index b745a80829..894dfb1349 100644
--- a/direct/src/distributed/ServerRepository.py
+++ b/direct/src/distributed/ServerRepository.py
@@ -1,6 +1,7 @@
 """ServerRepository module: contains the ServerRepository class"""
 
-from pandac.PandaModules import *
+from panda3d.core import *
+from panda3d.direct import *
 from direct.distributed.MsgTypesCMU import *
 from direct.task import Task
 from direct.directnotify import DirectNotifyGlobal
diff --git a/direct/src/distributed/TimeManager.py b/direct/src/distributed/TimeManager.py
index f74a97300b..714abd7f7d 100644
--- a/direct/src/distributed/TimeManager.py
+++ b/direct/src/distributed/TimeManager.py
@@ -1,5 +1,5 @@
 from direct.showbase.DirectObject import *
-from pandac.PandaModules import *
+from panda3d.core import *
 from direct.task import Task
 from direct.distributed import DistributedObject
 from direct.directnotify import DirectNotifyGlobal
diff --git a/direct/src/distributed/TimeManagerAI.py b/direct/src/distributed/TimeManagerAI.py
index c912394326..8e96befb2f 100644
--- a/direct/src/distributed/TimeManagerAI.py
+++ b/direct/src/distributed/TimeManagerAI.py
@@ -1,5 +1,4 @@
 from direct.distributed.ClockDelta import *
-from pandac.PandaModules import *
 from direct.distributed import DistributedObjectAI
 
 class TimeManagerAI(DistributedObjectAI.DistributedObjectAI):