diff --git a/etg/bmpbndl.py b/etg/bmpbndl.py
index 7af51eca..ee8a118d 100644
--- a/etg/bmpbndl.py
+++ b/etg/bmpbndl.py
@@ -10,7 +10,6 @@
 import etgtools
 import etgtools.tweaker_tools as tools
 from etgtools import MethodDef
-import etgtools.tweaker_tools
 
 PACKAGE   = "wx"
 MODULE    = "_core"
@@ -44,7 +43,7 @@ def run():
 
     # Allow on-the-fly creation of a wx.BitmapBundle from a wx.Bitmap, wx.Icon
     # or a wx.Image
-    c.convertFromPyObject = etgtools.tweaker_tools.AutoConversionInfo(
+    c.convertFromPyObject = tools.AutoConversionInfo(
         ('wx.Bitmap', 'wx.Icon', ),
         """\
         // Check for type compatibility
diff --git a/etg/colour.py b/etg/colour.py
index cdad3365..be45703f 100644
--- a/etg/colour.py
+++ b/etg/colour.py
@@ -9,7 +9,6 @@
 
 import etgtools
 import etgtools.tweaker_tools as tools
-import etgtools.tweaker_tools
 
 PACKAGE   = "wx"
 MODULE    = "_core"
@@ -193,7 +192,7 @@ def run():
     #     String with color name or #RRGGBB or #RRGGBBAA format
     #     None  (converts to wxNullColour)
     c.allowNone = True
-    c.convertFromPyObject = etgtools.tweaker_tools.AutoConversionInfo(
+    c.convertFromPyObject = tools.AutoConversionInfo(
         ('wx.Colour', '_ThreeInts', '_FourInts', 'str', 'None'),
         """\
         // is it just a typecheck?
diff --git a/etg/propgridiface.py b/etg/propgridiface.py
index 5e803b52..da4feaed 100644
--- a/etg/propgridiface.py
+++ b/etg/propgridiface.py
@@ -9,7 +9,6 @@
 
 import etgtools
 import etgtools.tweaker_tools as tools
-import etgtools.tweaker_tools
 
 PACKAGE   = "wx"
 MODULE    = "_propgrid"
@@ -71,7 +70,7 @@ def run():
 
     c.find('GetPtr').overloads[0].ignore()
 
-    c.convertFromPyObject = etgtools.tweaker_tools.AutoConversionInfo(
+    c.convertFromPyObject = tools.AutoConversionInfo(
         ('str', 'None', ),
         """\
         // Code to test a PyObject for compatibility with wxPGPropArgCls
diff --git a/etg/stream.py b/etg/stream.py
index 00125a86..093c7903 100644
--- a/etg/stream.py
+++ b/etg/stream.py
@@ -9,7 +9,6 @@
 
 import etgtools
 import etgtools.tweaker_tools as tools
-import etgtools.tweaker_tools
 
 PACKAGE   = "wx"
 MODULE    = "_core"
@@ -77,7 +76,7 @@ def run():
     c.includeCppCode('src/stream_input.cpp')
 
     # Use that class for the convert code
-    c.convertFromPyObject = etgtools.tweaker_tools.AutoConversionInfo(
+    c.convertFromPyObject = tools.AutoConversionInfo(
         (), # TODO: Track down what python types actually can be wrapped
         """\
         // is it just a typecheck?
@@ -239,7 +238,7 @@ def run():
     c.includeCppCode('src/stream_output.cpp')
 
     # Use that class for the convert code
-    c.convertFromPyObject = etgtools.tweaker_tools.AutoConversionInfo(
+    c.convertFromPyObject = tools.AutoConversionInfo(
         (), # TODO: Track down what python types can actually be converted
         """\
         // is it just a typecheck?
diff --git a/etg/wxdatetime.py b/etg/wxdatetime.py
index acaa94c6..bb4e681b 100644
--- a/etg/wxdatetime.py
+++ b/etg/wxdatetime.py
@@ -9,7 +9,6 @@
 
 import etgtools
 import etgtools.tweaker_tools as tools
-import etgtools.tweaker_tools
 
 PACKAGE   = "wx"
 MODULE    = "_core"
@@ -312,7 +311,7 @@ def run():
 
     # Add some code (like MappedTypes) to automatically convert from a Python
     # datetime.date or a datetime.datetime object
-    c.convertFromPyObject = etgtools.tweaker_tools.AutoConversionInfo(
+    c.convertFromPyObject = tools.AutoConversionInfo(
         ('datetime', 'date', ),
         """\
         // Code to test a PyObject for compatibility with wxDateTime