diff --git a/src/Mod/Fem/FemBeamSection.py b/src/Mod/Fem/FemBeamSection.py
index b48ad3d32..2285cb534 100644
--- a/src/Mod/Fem/FemBeamSection.py
+++ b/src/Mod/Fem/FemBeamSection.py
@@ -26,16 +26,13 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
+import FemGui
+import _FemBeamSection
 
 
 def makeFemBeamSection(width=20.0, height=20.0, name="BeamSection"):
     '''makeFemBeamSection([width], [height], [name]): creates an beamsection object to define a cross section'''
     obj = FemGui.getActiveAnalysis().Document.addObject("Fem::FeaturePython", name)
-    import _FemBeamSection
     _FemBeamSection._FemBeamSection(obj)
     obj.Width = width
     obj.Height = height
diff --git a/src/Mod/Fem/FemShellThickness.py b/src/Mod/Fem/FemShellThickness.py
index 62d19fab4..9b5e4583a 100644
--- a/src/Mod/Fem/FemShellThickness.py
+++ b/src/Mod/Fem/FemShellThickness.py
@@ -26,16 +26,13 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
+import FemGui
+import _FemShellThickness
 
 
 def makeFemShellThickness(thickness=20.0, name="ShellThickness"):
     '''makeFemShellThickness([thickness], [name]): creates an shellthickness object to define a plate thickness'''
     obj = FemGui.getActiveAnalysis().Document.addObject("Fem::FeaturePython", name)
-    import _FemShellThickness
     _FemShellThickness._FemShellThickness(obj)
     obj.Thickness = thickness
     if FreeCAD.GuiUp:
diff --git a/src/Mod/Fem/MechanicalMaterial.py b/src/Mod/Fem/MechanicalMaterial.py
index 461468d46..16e7c23f2 100644
--- a/src/Mod/Fem/MechanicalMaterial.py
+++ b/src/Mod/Fem/MechanicalMaterial.py
@@ -26,18 +26,13 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
+import _MechanicalMaterial
 
 
 def makeMechanicalMaterial(name):
     '''makeMaterial(name): makes an Material
     name there fore is a material name or an file name for a FCMat file'''
     obj = FreeCAD.ActiveDocument.addObject("App::MaterialObjectPython", name)
-    import _MechanicalMaterial
     _MechanicalMaterial._MechanicalMaterial(obj)
     if FreeCAD.GuiUp:
         import _ViewProviderMechanicalMaterial
diff --git a/src/Mod/Fem/_CommandFemBeamSection.py b/src/Mod/Fem/_CommandFemBeamSection.py
index cc08eaa34..804efb945 100644
--- a/src/Mod/Fem/_CommandFemBeamSection.py
+++ b/src/Mod/Fem/_CommandFemBeamSection.py
@@ -30,7 +30,6 @@ from FemCommands import FemCommands
 
 if FreeCAD.GuiUp:
     import FreeCADGui
-    import FemGui
     from PySide import QtCore
 
 
diff --git a/src/Mod/Fem/_CommandFemShellThickness.py b/src/Mod/Fem/_CommandFemShellThickness.py
index ae9d992c4..e97e673d9 100644
--- a/src/Mod/Fem/_CommandFemShellThickness.py
+++ b/src/Mod/Fem/_CommandFemShellThickness.py
@@ -30,7 +30,6 @@ from FemCommands import FemCommands
 
 if FreeCAD.GuiUp:
     import FreeCADGui
-    import FemGui
     from PySide import QtCore
 
 
diff --git a/src/Mod/Fem/_FemBeamSectionTaskPanel.py b/src/Mod/Fem/_FemBeamSectionTaskPanel.py
index c8281dc2d..4d3c498ad 100644
--- a/src/Mod/Fem/_FemBeamSectionTaskPanel.py
+++ b/src/Mod/Fem/_FemBeamSectionTaskPanel.py
@@ -26,13 +26,9 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from PySide import QtGui
-    from PySide import QtCore
-    from pivy import coin
+import FreeCADGui
+from PySide import QtGui
+from PySide import QtCore
 
 
 class _FemBeamSectionTaskPanel:
diff --git a/src/Mod/Fem/_FemShellThicknessTaskPanel.py b/src/Mod/Fem/_FemShellThicknessTaskPanel.py
index ee1eb08bd..4138026e6 100644
--- a/src/Mod/Fem/_FemShellThicknessTaskPanel.py
+++ b/src/Mod/Fem/_FemShellThicknessTaskPanel.py
@@ -26,13 +26,9 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from PySide import QtGui
-    from PySide import QtCore
-    from pivy import coin
+import FreeCADGui
+from PySide import QtGui
+from PySide import QtCore
 
 
 class _FemShellThicknessTaskPanel:
diff --git a/src/Mod/Fem/_MechanicalMaterialTaskPanel.py b/src/Mod/Fem/_MechanicalMaterialTaskPanel.py
index fe3bf1c04..b8417b638 100644
--- a/src/Mod/Fem/_MechanicalMaterialTaskPanel.py
+++ b/src/Mod/Fem/_MechanicalMaterialTaskPanel.py
@@ -26,13 +26,9 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from PySide import QtGui
-    from PySide import QtCore
+import FreeCADGui
+from PySide import QtGui
+from PySide import QtCore
 
 
 class _MechanicalMaterialTaskPanel:
diff --git a/src/Mod/Fem/_ViewProviderFemBeamSection.py b/src/Mod/Fem/_ViewProviderFemBeamSection.py
index d9bc6a839..742f7185f 100644
--- a/src/Mod/Fem/_ViewProviderFemBeamSection.py
+++ b/src/Mod/Fem/_ViewProviderFemBeamSection.py
@@ -26,11 +26,8 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from pivy import coin
+import FreeCADGui
+from pivy import coin
 
 
 class _ViewProviderFemBeamSection:
diff --git a/src/Mod/Fem/_ViewProviderFemShellThickness.py b/src/Mod/Fem/_ViewProviderFemShellThickness.py
index 7ea1f456e..67b9cc619 100644
--- a/src/Mod/Fem/_ViewProviderFemShellThickness.py
+++ b/src/Mod/Fem/_ViewProviderFemShellThickness.py
@@ -26,11 +26,8 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
-    from pivy import coin
+import FreeCADGui
+from pivy import coin
 
 
 class _ViewProviderFemShellThickness:
diff --git a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py b/src/Mod/Fem/_ViewProviderMechanicalMaterial.py
index 04eeeabfb..287438d49 100644
--- a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py
+++ b/src/Mod/Fem/_ViewProviderMechanicalMaterial.py
@@ -26,11 +26,7 @@ __url__ = "http://www.freecadweb.org"
 
 
 import FreeCAD
-from FemCommands import FemCommands
-
-if FreeCAD.GuiUp:
-    import FreeCADGui
-    import FemGui
+import FreeCADGui
 
 
 class _ViewProviderMechanicalMaterial: