diff --git a/src/Gui/ViewProviderOriginFeature.h b/src/Gui/ViewProviderOriginFeature.h
index 588cd3eda..7bdde1568 100644
--- a/src/Gui/ViewProviderOriginFeature.h
+++ b/src/Gui/ViewProviderOriginFeature.h
@@ -34,7 +34,7 @@ namespace Gui
 /**
  * View provider associated with an App::OriginFeature.
  */
-class ViewProviderOriginFeature: public ViewProviderGeometryObject {
+class GuiExport ViewProviderOriginFeature: public ViewProviderGeometryObject {
     PROPERTY_HEADER(Gui::ViewProviderOriginFeature);
 
 public:
diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
index 775282dbe..198e957fa 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
@@ -112,7 +112,7 @@ void ViewProviderBody::setDisplayMode(const char* ModeName) {
         PartGui::ViewProviderPartExt::setDisplayMode(ModeName);
 }
 
-void ViewProviderBody::setOverrideMode(const std::__cxx11::string& mode) {
+void ViewProviderBody::setOverrideMode(const std::string& mode) {
     
     //if we are in through mode, we need to ensure that the override mode is not set for the body
     //(as this would result in "tip" mode), it is enough when the children are set to the correct 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h
index 8ea0c42d8..49846ea74 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h
@@ -59,7 +59,7 @@ public:
     virtual SoGroup* getChildRoot(void) const {return pcBodyChildren;}
     virtual std::vector<App::DocumentObject*> claimChildren3D(void)const;
     virtual void setDisplayMode(const char* ModeName);
-    virtual void setOverrideMode(const std::__cxx11::string& mode);
+    virtual void setOverrideMode(const std::string& mode);
 
     virtual bool onDelete(const std::vector<std::string> &);