diff --git a/src/App/FreeCADTest.py b/src/App/FreeCADTest.py
index 6ce4d40a67..ab6984e7c8 100644
--- a/src/App/FreeCADTest.py
+++ b/src/App/FreeCADTest.py
@@ -32,7 +32,10 @@
 
 Log ("FreeCAD test running...\n\n")
 
-import TestApp, sys
+import sys
+
+import FreeCAD
+import TestApp
 
 testCase = FreeCAD.ConfigGet("TestCase")
 
diff --git a/src/Mod/Path/PathScripts/Macros/create_tool.py b/src/Mod/Path/PathScripts/Macros/create_tool.py
index 2f0398dc67..bec8f0a4a0 100644
--- a/src/Mod/Path/PathScripts/Macros/create_tool.py
+++ b/src/Mod/Path/PathScripts/Macros/create_tool.py
@@ -24,6 +24,9 @@
 This macro is used in conjunction with the toolpathparams script to create an object that represents a tool for use in a CNC program. Create a group and then select it- then run the macro.
 You will have to edit the parameters inside the Data tab of the tool object.
 '''
+
+import FreeCAD
+import FreeCADGui
 import PathScripts
 import toolpathparams as tp
 
diff --git a/src/Mod/TechDraw/moveViews.py b/src/Mod/TechDraw/moveViews.py
index 2fab352f77..08cd01c37a 100644
--- a/src/Mod/TechDraw/moveViews.py
+++ b/src/Mod/TechDraw/moveViews.py
@@ -7,6 +7,7 @@
 #          (ie an SVG symbol)
 
 import FreeCAD
+import FreeCADGui
 import Part
 import Drawing
 import TechDraw
diff --git a/src/Mod/TemplatePyMod/SplineSurface.py b/src/Mod/TemplatePyMod/SplineSurface.py
index b946b1293d..862894ba3b 100644
--- a/src/Mod/TemplatePyMod/SplineSurface.py
+++ b/src/Mod/TemplatePyMod/SplineSurface.py
@@ -5,6 +5,8 @@
 # len(knot_u) := nNodes_u + degree_u + 1
 # len(knot_v) := nNodes_v + degree_v + 1
 
+import FreeCAD
+
 degree_u=2
 degree_v=2
 nNodes_u=5
diff --git a/src/Mod/Test/testPathArray.py b/src/Mod/Test/testPathArray.py
index 5b84b2b572..dabd0c1352 100644
--- a/src/Mod/Test/testPathArray.py
+++ b/src/Mod/Test/testPathArray.py
@@ -7,6 +7,7 @@
 # DWire, etc) then run this macro.
 
 import FreeCAD
+import FreeCADGui
 import Part
 import Draft
 
diff --git a/src/Mod/Test/testPathArraySel.py b/src/Mod/Test/testPathArraySel.py
index 413ab1be3f..b6a27975f4 100644
--- a/src/Mod/Test/testPathArraySel.py
+++ b/src/Mod/Test/testPathArraySel.py
@@ -6,6 +6,7 @@
 # tree, not document view!!), then select edges from the "wire" object.
 
 import FreeCAD
+import FreeCADGui
 import Part
 import Draft