diff --git a/src/Mod/Part/App/Attacher.h b/src/Mod/Part/App/Attacher.h
index 3a3ba9e53fe8..bd7716e0590a 100644
--- a/src/Mod/Part/App/Attacher.h
+++ b/src/Mod/Part/App/Attacher.h
@@ -42,8 +42,6 @@
 
 #include <gp_Vec.hxx>
 
-using namespace Part;
-
 namespace Attacher
 {
 
diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
index 96e9b4a1ecb1..f982b563bc76 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
@@ -210,7 +210,7 @@ TopoDS_Face ProfileBased::getVerifiedFace(bool silent) const {
                 err = "Linked object has no subshape specified";
             else {
                 
-                const TopoShape& shape = Profile.getValue<Part::Feature*>()->Shape.getShape();
+                const Part::TopoShape& shape = Profile.getValue<Part::Feature*>()->Shape.getShape();
                 TopoDS_Shape sub = shape.getSubShape(Profile.getSubValues()[0].c_str());
                 if(sub.ShapeType() == TopAbs_FACE) 
                     return TopoDS::Face(sub);
diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp
index 5de9cc8f86f7..e5dca7994e87 100644
--- a/src/Mod/PartDesign/App/ShapeBinder.cpp
+++ b/src/Mod/PartDesign/App/ShapeBinder.cpp
@@ -121,7 +121,7 @@ void ShapeBinder::getFilterdReferences(App::PropertyLinkSubList* prop, Part::Fea
 }
 
 
-TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector< std::string > subs) {
+Part::TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector< std::string > subs) {
 
     if(!obj)
         return TopoDS_Shape();
@@ -130,7 +130,7 @@ TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector
         return obj->Shape.getShape();
 
     //if we use multiple subshapes we build a shape from them by fusing them together
-    TopoShape base;
+    Part::TopoShape base;
     std::vector<TopoDS_Shape> operators;
     for(std::string sub : subs) {
 
@@ -141,11 +141,11 @@ TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector
     }
 
     try {
-    if(!operators.empty() && !base.isNull())
-        return base.multiFuse(operators);
+        if(!operators.empty() && !base.isNull())
+            return base.multiFuse(operators);
     }
     catch(...) {
         return base;
     }
     return base;
-}
\ No newline at end of file
+}
diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h
index 9aaddf70ecfc..f361608b865f 100644
--- a/src/Mod/PartDesign/App/ShapeBinder.h
+++ b/src/Mod/PartDesign/App/ShapeBinder.h
@@ -50,7 +50,7 @@ class PartDesignExport ShapeBinder : public Part::Feature
     App::PropertyLinkSubList    Support;
 
     static void getFilterdReferences(App::PropertyLinkSubList* prop, Part::Feature*& object, std::vector< std::string >& subobjects);
-    static TopoShape buildShapeFromReferences(Feature* obj, std::vector< std::string > subs);
+    static Part::TopoShape buildShapeFromReferences(Feature* obj, std::vector< std::string > subs);
 
     const char* getViewProviderName(void) const {
         return "PartDesignGui::ViewProviderShapeBinder";
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index a9d1b46c3eaf..09f887114a0b 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -112,7 +112,7 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name)
 
             //test if current selection fits a mode.
             if (support.getSize() > 0) {
-                AttachableObject* pcDatum = static_cast<AttachableObject*>(cmd.getDocument()->getObject(FeatName.c_str()));
+                Part::AttachableObject* pcDatum = static_cast<Part::AttachableObject*>(cmd.getDocument()->getObject(FeatName.c_str()));
                 pcDatum->attacher().references.Paste(support);
                 eSuggestResult msg;
                 eMapMode suggMode = pcDatum->attacher().listMapModes(msg);
diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
index 0c5c15fa9911..8c038af257d3 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
@@ -869,7 +869,7 @@ void TaskDlgDatumParameters::clicked(int)
 bool TaskDlgDatumParameters::accept()
 {
     std::string name = DatumView->getObject()->getNameInDocument();
-    Datum* pcDatum = static_cast<Datum*>(DatumView->getObject());
+    Part::Datum* pcDatum = static_cast<Part::Datum*>(DatumView->getObject());
     auto pcActiveBody = PartDesignGui::getBodyFor(pcDatum, false);
     auto pcActivePart = PartDesignGui::getPartFor(pcActiveBody, false);
     std::vector<App::DocumentObject*> copies;
diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h
index 4b12be27c8a2..d8affdc793c7 100644
--- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h
@@ -190,7 +190,7 @@ protected Q_SLOTS:
     static void removeItemFromListWidget(QListWidget* widget, const char* itemstr);
 
     void fillAxisCombo(ComboLinks &combolinks, Part::Part2DObject *sketch);
-    void fillPlanesCombo(ComboLinks &combolinks, Part2DObject *sketch);
+    void fillPlanesCombo(ComboLinks &combolinks, Part::Part2DObject *sketch);
 
 protected:
     QWidget* proxy;