diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt
index 622bad5ce9..0ce2fe0b4a 100644
--- a/src/Mod/Surface/App/CMakeLists.txt
+++ b/src/Mod/Surface/App/CMakeLists.txt
@@ -19,7 +19,6 @@ set(Surface_LIBS
 )
 
 SET(Surface_SRCS
-    ../FillType.h
     AppSurface.cpp
     PreCompiled.cpp
     PreCompiled.h
@@ -35,6 +34,7 @@ SET(Surface_SRCS
     FeatureBezSurf.cpp
     FeatureBSplineSurf.h
     FeatureBSplineSurf.cpp
+    FillType.h
 )
 
 link_directories(${OCC_LIBRARY_DIR})
diff --git a/src/Mod/Surface/App/FeatureBSurf.h b/src/Mod/Surface/App/FeatureBSurf.h
index fd63b5396b..e005c94e3d 100644
--- a/src/Mod/Surface/App/FeatureBSurf.h
+++ b/src/Mod/Surface/App/FeatureBSurf.h
@@ -32,7 +32,7 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/PartFeature.h>
-#include <Mod/Surface/FillType.h>
+#include <Mod/Surface/App/FillType.h>
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/FillType.h b/src/Mod/Surface/App/FillType.h
similarity index 100%
rename from src/Mod/Surface/FillType.h
rename to src/Mod/Surface/App/FillType.h
diff --git a/src/Mod/Surface/Gui/BSurf.cpp b/src/Mod/Surface/Gui/BSurf.cpp
index e107a4b735..ca491c174f 100644
--- a/src/Mod/Surface/Gui/BSurf.cpp
+++ b/src/Mod/Surface/Gui/BSurf.cpp
@@ -23,7 +23,7 @@
 #include "PreCompiled.h"
 
 #include <Mod/Surface/App/FeatureBSurf.h>
-#include <Mod/Surface/FillType.h>
+#include <Mod/Surface/App/FillType.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt
index c8b9268f07..9c73d99610 100644
--- a/src/Mod/Surface/Gui/CMakeLists.txt
+++ b/src/Mod/Surface/Gui/CMakeLists.txt
@@ -43,7 +43,6 @@ SET(SurfaceGui_SRCS
     ${SurfaceGui_UIC_HDRS}
     BSurf.cpp
     BSurf.h
-    ../FillType.h
     AppSurfaceGui.cpp
     Command.cpp
     PreCompiled.cpp