diff --git a/src/Mod/Draft/Makefile.am b/src/Mod/Draft/Makefile.am
index baf95a192..7cf2d4224 100644
--- a/src/Mod/Draft/Makefile.am
+++ b/src/Mod/Draft/Makefile.am
@@ -74,8 +74,10 @@ EXTRA_DIST = \
         Resources/icons/Draft_Arc.svg \
         Resources/icons/Draft_BSpline.svg \
         Resources/icons/Draft_Circle.svg \
+        Resources/icons/Draft_Cursor.svg \
         Resources/icons/Draft_DelPoint.svg \
         Resources/icons/Draft_Dimension.svg \
+        Resources/icons/Draft_Dot.svg \
         Resources/icons/Draft_Downgrade.svg \
         Resources/icons/Draft_Drawing.svg \
         Resources/icons/Draft_Edit.svg \
@@ -85,6 +87,7 @@ EXTRA_DIST = \
         Resources/icons/Draft_Macro.svg \
         Resources/icons/Draft_Move.svg \
         Resources/icons/Draft_Offset.svg \
+        Resources/icons/Draft_Point.svg \
         Resources/icons/Draft_Polygon.svg \
         Resources/icons/Draft_Rectangle.svg \
         Resources/icons/Draft_Rotate.svg \
diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
index e34184eec..4cb50e288 100644
--- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
+++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
@@ -406,9 +406,9 @@ void TaskOrthoViews::pagesize(std::string& page_template)
     }
 
     // open Template file
-    string line;
-    string temp_line;
-    ifstream file (fi.filePath().c_str());
+    std::string line;
+    std::string temp_line;
+    std::ifstream file (fi.filePath().c_str());
     size_t found;
     bool done = false;
     
@@ -418,12 +418,12 @@ void TaskOrthoViews::pagesize(std::string& page_template)
         {
             getline (file,line);
             found = line.find("width=");
-            if (found != string::npos)
+            if (found != std::string::npos)
             {
                 temp_line = line.substr(7+found);
                 found = temp_line.find("\"");
                 temp_line = temp_line.substr(0,found);
-                stringstream num_str(temp_line);
+                std::stringstream num_str(temp_line);
                 num_str >> pagewidth;
                 pagewidth -= 2*margin;
                 if (done)
@@ -436,12 +436,12 @@ void TaskOrthoViews::pagesize(std::string& page_template)
             }
             
             found = line.find("height=");
-            if (found != string::npos)
+            if (found != std::string::npos)
             {
                 temp_line = line.substr(8+found);
                 found = temp_line.find("\"");
                 temp_line = temp_line.substr(0,found);
-                stringstream num_str_2(temp_line);
+                std::stringstream num_str_2(temp_line);
                 num_str_2 >> pageh1;
                 pageh1 -= 2*margin;
                 pageh2 = pageh1;
@@ -454,7 +454,7 @@ void TaskOrthoViews::pagesize(std::string& page_template)
                     done = true;
             }
             
-            if (line.find("metadata") != string::npos)      //give up if we meet a metadata tag
+            if (line.find("metadata") != std::string::npos)      //give up if we meet a metadata tag
                 break;
         }
     }
diff --git a/src/Mod/Part/App/modelRefine.cpp b/src/Mod/Part/App/modelRefine.cpp
index c11bb19a6..a42e11def 100644
--- a/src/Mod/Part/App/modelRefine.cpp
+++ b/src/Mod/Part/App/modelRefine.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #include <algorithm>
+#include <iterator>
 #include <Geom_Surface.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <Geom_Plane.hxx>