diff --git a/docs/EXAMPLE b/docs/EXAMPLE
index ca3ed617c..7070eb2bc 100644
--- a/docs/EXAMPLE
+++ b/docs/EXAMPLE
@@ -80,7 +80,7 @@ is available as examples/Random.py):
 Add the module docstring here.  This will be used by the setup.py script.
 """
 
-from baseplugin import *
+import plugins
 
 import utils
 import privmsgs
diff --git a/scripts/supybot-adduser.py b/scripts/supybot-adduser.py
index ee2f962d9..f3242c4b5 100755
--- a/scripts/supybot-adduser.py
+++ b/scripts/supybot-adduser.py
@@ -31,7 +31,7 @@
 
 import supybot
 
-from fix import *
+import fix
 from questions import *
 
 import os
diff --git a/scripts/supybot-newplugin.py b/scripts/supybot-newplugin.py
index 4659cb381..a1e674dcc 100755
--- a/scripts/supybot-newplugin.py
+++ b/scripts/supybot-newplugin.py
@@ -50,7 +50,7 @@ template = '''
 Add the module docstring here.  This will be used by the setup.py script.
 """
 
-from baseplugin import *
+import plugins
 
 import utils
 import privmsgs
diff --git a/scripts/supybot-wizard.py b/scripts/supybot-wizard.py
index 54e291420..b1303f8b1 100755
--- a/scripts/supybot-wizard.py
+++ b/scripts/supybot-wizard.py
@@ -2,7 +2,7 @@
 
 import supybot
 
-from fix import *
+import fix
 
 import os
 import sys
diff --git a/test/test.py b/test/test.py
index 399906040..b1202a625 100755
--- a/test/test.py
+++ b/test/test.py
@@ -37,7 +37,7 @@ conf.confDir = 'test-conf'
 conf.logDir = 'test-log'
 conf.replyWhenNotCommand = False
 
-from fix import *
+import fix
 
 import gc
 import re
diff --git a/tools/generate-plugin-documentation.py b/tools/generate-plugin-documentation.py
index 9eb727f79..374fe5b5d 100755
--- a/tools/generate-plugin-documentation.py
+++ b/tools/generate-plugin-documentation.py
@@ -40,7 +40,7 @@ import traceback
 if 'src' not in sys.path:
     sys.path.insert(0, 'src')
 
-from fix import *
+import fix
 
 import conf
 import callbacks