diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt
index 51bd0ecd43..397773bce6 100644
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -208,6 +208,8 @@ SET(PartGui_SRCS
     ViewProviderPrimitive.h
     Workbench.cpp
     Workbench.h
+    ReferenceHighlighter.cpp
+    ReferenceHighlighter.h
     ShapeFromMesh.cpp
     ShapeFromMesh.h
     TaskFaceColors.cpp
diff --git a/src/Mod/PartDesign/Gui/ReferenceHighlighter.cpp b/src/Mod/Part/Gui/ReferenceHighlighter.cpp
similarity index 99%
rename from src/Mod/PartDesign/Gui/ReferenceHighlighter.cpp
rename to src/Mod/Part/Gui/ReferenceHighlighter.cpp
index a3893cb53b..de28037c15 100644
--- a/src/Mod/PartDesign/Gui/ReferenceHighlighter.cpp
+++ b/src/Mod/Part/Gui/ReferenceHighlighter.cpp
@@ -32,7 +32,7 @@
 #include "ReferenceHighlighter.h"
 
 
-using namespace PartDesignGui;
+using namespace PartGui;
 
 ReferenceHighlighter::ReferenceHighlighter(const TopoDS_Shape& shape, const App::Color& color)
     : defaultColor(color)
diff --git a/src/Mod/PartDesign/Gui/ReferenceHighlighter.h b/src/Mod/Part/Gui/ReferenceHighlighter.h
similarity index 93%
rename from src/Mod/PartDesign/Gui/ReferenceHighlighter.h
rename to src/Mod/Part/Gui/ReferenceHighlighter.h
index 4b1ebefca6..7a7afb789c 100644
--- a/src/Mod/PartDesign/Gui/ReferenceHighlighter.h
+++ b/src/Mod/Part/Gui/ReferenceHighlighter.h
@@ -21,21 +21,22 @@
  ***************************************************************************/
 
 
-#ifndef PARTDESIGNGUI_REFERENCEHIGHLIGHTER_H
-#define PARTDESIGNGUI_REFERENCEHIGHLIGHTER_H
+#ifndef PARTGUI_REFERENCEHIGHLIGHTER_H
+#define PARTGUI_REFERENCEHIGHLIGHTER_H
 
-#include <App/Material.h>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <vector>
+#include <App/Material.h>
+#include <Mod/Part/PartGlobal.h>
 
-namespace PartDesignGui {
+namespace PartGui {
 
 /*!
  * \brief The ReferenceHighlighter class
  * \author Werner Mayer
  */
-class ReferenceHighlighter
+class PartGuiExport ReferenceHighlighter
 {
 public:
     /*!
@@ -86,7 +87,7 @@ private:
 };
 
 
-} // namespace PartDesignGui
+} // namespace PartGui
 
 
-#endif // PARTDESIGNGUI_REFERENCEHIGHLIGHTER_H
+#endif // PARTGUI_REFERENCEHIGHLIGHTER_H
diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt
index d04dc40fa2..2ef6ad7882 100644
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -226,8 +226,6 @@ SET(PartDesignGuiModule_SRCS
     CommandBody.cpp
     EnumFlags.h
     Resources/PartDesign.qrc
-    ReferenceHighlighter.cpp
-    ReferenceHighlighter.h
     PreCompiled.cpp
     PreCompiled.h
     Utils.cpp
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp
index de87836a5d..1f4c658c37 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp
@@ -32,11 +32,11 @@
 # include <TopExp.hxx>
 #endif
 
-#include <Mod/PartDesign/App/FeatureDressUp.h>
 #include <Gui/Application.h>
+#include <Mod/Part/Gui/ReferenceHighlighter.h>
+#include <Mod/PartDesign/App/FeatureDressUp.h>
 
 #include "ViewProviderDressUp.h"
-#include "ReferenceHighlighter.h"
 #include "TaskDressUpParameters.h"
 
 using namespace PartDesignGui;
@@ -99,7 +99,7 @@ void ViewProviderDressUp::highlightReferences(const bool on)
             originalFaceColors = vp->DiffuseColor.getValues();
             std::vector<App::Color> colors = originalFaceColors;
 
-            ReferenceHighlighter highlighter(base->Shape.getValue(), ShapeColor.getValue());
+            PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), ShapeColor.getValue());
             highlighter.getFaceColors(faces, colors);
             vp->DiffuseColor.setValues(colors);
         }
@@ -107,7 +107,7 @@ void ViewProviderDressUp::highlightReferences(const bool on)
             originalLineColors = vp->LineColorArray.getValues();
             std::vector<App::Color> colors = originalLineColors;
 
-            ReferenceHighlighter highlighter(base->Shape.getValue(), LineColor.getValue());
+            PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), LineColor.getValue());
             highlighter.getEdgeColors(edges, colors);
             vp->LineColorArray.setValues(colors);
         }
diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
index 85bb8fd335..b4de80d1fd 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
@@ -31,10 +31,10 @@
 #include "Utils.h"
 #include "ViewProviderLoft.h"
 #include "TaskLoftParameters.h"
-#include "ReferenceHighlighter.h"
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeatureLoft.h>
 #include <Mod/Sketcher/App/SketchObject.h>
+#include <Mod/Part/Gui/ReferenceHighlighter.h>
 #include <Gui/Control.h>
 #include <Gui/Command.h>
 #include <Gui/Application.h>
@@ -166,7 +166,7 @@ void ViewProviderLoft::highlightReferences(Part::Feature* base, const std::vecto
         edgeColors = svp->LineColorArray.getValues();
         std::vector<App::Color> colors = edgeColors;
 
-        ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue());
+        PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue());
         highlighter.getEdgeColors(elements, colors);
         svp->LineColorArray.setValues(colors);
     }
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
index b5844929dd..6409564ac1 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
@@ -33,10 +33,10 @@
 #include "Utils.h"
 #include "ViewProviderPipe.h"
 #include "TaskPipeParameters.h"
-#include "ReferenceHighlighter.h"
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeaturePipe.h>
 #include <Mod/Sketcher/App/SketchObject.h>
+#include <Mod/Part/Gui/ReferenceHighlighter.h>
 #include <Gui/Control.h>
 #include <Gui/Command.h>
 #include <Gui/Application.h>
@@ -167,7 +167,7 @@ void ViewProviderPipe::highlightReferences(Part::Feature* base, const std::vecto
             edgeColors = svp->LineColorArray.getValues();
             std::vector<App::Color> colors = edgeColors;
 
-            ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue());
+            PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue());
             highlighter.getEdgeColors(edges, colors);
             svp->LineColorArray.setValues(colors);
         }