diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py
index 00fff2adbd..447693ff7c 100644
--- a/src/Mod/Draft/DraftSnap.py
+++ b/src/Mod/Draft/DraftSnap.py
@@ -1480,11 +1480,3 @@ class Snapper:
                 self.holdTracker.addCoords(self.spoint)
                 self.holdTracker.on()
             self.holdPoints.append(self.spoint)
-
-if not hasattr(FreeCADGui,"Snapper"):
-    FreeCADGui.Snapper = Snapper()
-if not hasattr(FreeCAD,"DraftWorkingPlane"):
-    import WorkingPlane, Draft_rc
-    FreeCAD.DraftWorkingPlane = WorkingPlane.plane()
-    #print(FreeCAD.DraftWorkingPlane)
-    FreeCADGui.addIconPath(":/icons")
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 9803ca97d5..75f8cefb01 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -40,10 +40,18 @@ import sys, os, FreeCAD, FreeCADGui, WorkingPlane, math, re, Draft, Draft_rc, Dr
 from FreeCAD import Vector
 from PySide import QtCore,QtGui
 from DraftGui import todo, translate, utf8_decode
-from DraftSnap import *
+import DraftSnap
+import DraftGui
+import DraftTrackers
 from DraftTrackers import *
 from pivy import coin
 
+if not hasattr(FreeCADGui, "Snapper"):
+    FreeCADGui.Snapper = DraftSnap.Snapper()
+
+if not hasattr(FreeCAD, "DraftWorkingPlane"):
+    FreeCAD.DraftWorkingPlane = WorkingPlane.plane()
+
 #---------------------------------------------------------------------------
 # Commands that have been migrated to their own modules
 #---------------------------------------------------------------------------