diff --git a/src/Mod/TechDraw/App/EdgeWalker.cpp b/src/Mod/TechDraw/App/EdgeWalker.cpp
index 8f7ffe743..06dabbfde 100644
--- a/src/Mod/TechDraw/App/EdgeWalker.cpp
+++ b/src/Mod/TechDraw/App/EdgeWalker.cpp
@@ -61,12 +61,12 @@ void edgeVisitor::end_face()
     graphFaces.push_back(faceEdges);
 }
 
-facelist edgeVisitor::getResult(void)
+TechDraw::facelist edgeVisitor::getResult(void)
 {
     return graphFaces;
 }
 
-void edgeVisitor::setGraph(graph& g)
+void edgeVisitor::setGraph(TechDraw::graph& g)
 {
     std::cout << "setGraph()" << std::endl;
     m_g = g;
@@ -84,7 +84,7 @@ EdgeWalker::~EdgeWalker()
 {
 }
 
-bool EdgeWalker::loadEdges(std::vector<WalkerEdge> edges)
+bool EdgeWalker::loadEdges(std::vector<TechDraw::WalkerEdge> edges)
 {
     std::cout << "loadEdges()" << std::endl;
     for (auto e: edges) {
diff --git a/src/Mod/TechDraw/App/EdgeWalker.h b/src/Mod/TechDraw/App/EdgeWalker.h
index 18a266127..744a643e2 100644
--- a/src/Mod/TechDraw/App/EdgeWalker.h
+++ b/src/Mod/TechDraw/App/EdgeWalker.h
@@ -72,9 +72,9 @@ public:
   void setGraph(graph& g);
 
 private:
-    edgelist faceEdges;
-    facelist graphFaces;
-    graph m_g;
+    TechDraw::edgelist faceEdges;
+    TechDraw::facelist graphFaces;
+    TechDraw::graph m_g;
 };
 
 class EdgeWalker
@@ -83,14 +83,14 @@ public:
     EdgeWalker(void);
     virtual ~EdgeWalker();
 
-    bool loadEdges(std::vector<WalkerEdge> edges);
+    bool loadEdges(std::vector<TechDraw::WalkerEdge> edges);
     bool setSize(int size);
     bool perform();
     facelist getResult();
 
 private:
     edgeVisitor m_eV;
-    graph m_g;
+    TechDraw::graph m_g;
 };
 
 }  //end namespace
diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp
index 2ab2e2cce..20b34f749 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.cpp
+++ b/src/Mod/TechDraw/Gui/QGIFace.cpp
@@ -61,7 +61,7 @@ QGIFace::QGIFace(int index) :
     setFlag(QGraphicsItem::ItemIsMovable, false);
     setFlag(QGraphicsItem::ItemSendsScenePositionChanges, true);
     setFlag(QGraphicsItem::ItemSendsGeometryChanges,true);
-    setFlag(QGraphicsItem::QGraphicsItem::ItemClipsChildrenToShape,true);
+    setFlag(QGraphicsItem::ItemClipsChildrenToShape,true);
     //setFiltersChildEvents(true);
     setAcceptHoverEvents(true);