diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index 95796c7392..64d08dd8a1 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -1,5 +1,7 @@
 """Actor module: contains the Actor class"""
 
+__all__ = ['Actor']
+
 from pandac.PandaModules import *
 from direct.showbase.DirectObject import DirectObject
 from pandac.PandaModules import LODNode
diff --git a/direct/src/actor/DistributedActor.py b/direct/src/actor/DistributedActor.py
index df599e2a74..1c56c805cf 100644
--- a/direct/src/actor/DistributedActor.py
+++ b/direct/src/actor/DistributedActor.py
@@ -1,5 +1,7 @@
 """DistributedActor module: contains the DistributedActor class"""
 
+__all__ = ['DistributedActor']
+
 from direct.distributed import DistributedNode
 
 import Actor
diff --git a/direct/src/fsm/ClassicFSM.py b/direct/src/fsm/ClassicFSM.py
index bb4be8f22d..e35f7980ea 100644
--- a/direct/src/fsm/ClassicFSM.py
+++ b/direct/src/fsm/ClassicFSM.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ClassicFSM']
+
 """Finite State Machine module: contains the ClassicFSM class.
 
 This module and class exist only for backward compatibility with
diff --git a/direct/src/fsm/FSM.py b/direct/src/fsm/FSM.py
index 34c2917039..a69ba30d8a 100644
--- a/direct/src/fsm/FSM.py
+++ b/direct/src/fsm/FSM.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['FSMException', 'FSM']
+
 """
 The new Finite State Machine module.  This replaces the modules
 previously called FSM.py (now called ClassicFSM.py).
diff --git a/direct/src/fsm/FourState.py b/direct/src/fsm/FourState.py
index 66f58c69cf..49b2f02a3a 100755
--- a/direct/src/fsm/FourState.py
+++ b/direct/src/fsm/FourState.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['FourState']
+
 
 
 from direct.directnotify import DirectNotifyGlobal
diff --git a/direct/src/fsm/FourStateAI.py b/direct/src/fsm/FourStateAI.py
index 5d86ea70bb..cf4b344ab6 100755
--- a/direct/src/fsm/FourStateAI.py
+++ b/direct/src/fsm/FourStateAI.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['FourStateAI']
+
 
 
 from direct.directnotify import DirectNotifyGlobal
diff --git a/direct/src/fsm/SampleFSM.py b/direct/src/fsm/SampleFSM.py
index 2e03585ab9..e12c847a4b 100644
--- a/direct/src/fsm/SampleFSM.py
+++ b/direct/src/fsm/SampleFSM.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ClassicStyle', 'NewStyle', 'ToonEyes']
+
 import FSM
 from pandac.PandaModules import *
 from direct.task import Task
diff --git a/direct/src/fsm/State.py b/direct/src/fsm/State.py
index 156b5f9eb0..2220450018 100644
--- a/direct/src/fsm/State.py
+++ b/direct/src/fsm/State.py
@@ -1,6 +1,7 @@
-
 """State module: contains State class"""
 
+__all__ = ['State']
+
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase.DirectObject import DirectObject
 import types
diff --git a/direct/src/fsm/StateData.py b/direct/src/fsm/StateData.py
index d85230f124..7f3fd48b3a 100644
--- a/direct/src/fsm/StateData.py
+++ b/direct/src/fsm/StateData.py
@@ -1,6 +1,7 @@
-
 """StateData module: contains StateData class"""
 
+__all__ = ['StateData']
+
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase.DirectObject import DirectObject
 
diff --git a/direct/src/showbase/EventManager.py b/direct/src/showbase/EventManager.py
index c9face6d38..f46f06fe06 100644
--- a/direct/src/showbase/EventManager.py
+++ b/direct/src/showbase/EventManager.py
@@ -1,7 +1,8 @@
 
 from MessengerGlobal import *
-from direct.task.TaskManagerGlobal import *
+from direct.task.TaskManagerGlobal import taskMgr
 from direct.directnotify.DirectNotifyGlobal import *
+from direct.task.Task import Task
 
 class EventManager:
 
diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py
index aa14d6e254..2d3f8db5d3 100644
--- a/direct/src/task/Task.py
+++ b/direct/src/task/Task.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Task', 'TaskPriorityList', 'TaskManager']
+
 
 # This module may not import pandac.PandaModules, since it is imported
 # by the Toontown Launcher before the complete PandaModules have been
diff --git a/direct/src/task/TaskManagerGlobal.py b/direct/src/task/TaskManagerGlobal.py
index ec20e1e418..4c95232c4d 100644
--- a/direct/src/task/TaskManagerGlobal.py
+++ b/direct/src/task/TaskManagerGlobal.py
@@ -1,4 +1,7 @@
 """TaskManagerGlobal module: contains the global task manager"""
+
+__all__ = ['taskMgr']
+
 import Task
 
 taskMgr = Task.TaskManager()
diff --git a/direct/src/task/TaskTester.py b/direct/src/task/TaskTester.py
index 1161f2196f..e70a138e94 100755
--- a/direct/src/task/TaskTester.py
+++ b/direct/src/task/TaskTester.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = []
+
 from direct.task.TaskManagerGlobal import *
 import direct.task.Task
 import random
diff --git a/direct/src/task/Timer.py b/direct/src/task/Timer.py
index feeb8027c7..ddb188a24a 100644
--- a/direct/src/task/Timer.py
+++ b/direct/src/task/Timer.py
@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Timer']
+
 from pandac.PandaModules import *
 import Task