diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
index 06f6e00db..dde39f4a1 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
@@ -38,7 +38,7 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawViewAnnotation.h>
+#include <Mod/TechDraw/App/DrawViewAnnotation.h>
 #include "ViewProviderAnnotation.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
index 39e86ed64..33d94eba4 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
@@ -38,7 +38,7 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawViewDimension.h>
+#include <Mod/TechDraw/App/DrawViewDimension.h>
 #include "ViewProviderDimension.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp
index 73d76f099..b3c8e5693 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp
@@ -38,7 +38,7 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawHatch.h>
+#include <Mod/TechDraw/App/DrawHatch.h>
 #include "ViewProviderHatch.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
index fadda1be9..106c52567 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
@@ -58,12 +58,12 @@
 
 #include "MDIViewPage.h"
 #include "ViewProviderPage.h"
-#include <Mod/Drawing/App/DrawPage.h>
-#include <Mod/Drawing/App/DrawView.h>
-#include <Mod/Drawing/App/DrawProjGroupItem.h>
-#include <Mod/Drawing/App/DrawViewDimension.h>
-#include <Mod/Drawing/App/DrawHatch.h>
-#include <Mod/Drawing/App/DrawUtil.h>
+#include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawView.h>
+#include <Mod/TechDraw/App/DrawProjGroupItem.h>
+#include <Mod/TechDraw/App/DrawViewDimension.h>
+#include <Mod/TechDraw/App/DrawHatch.h>
+#include <Mod/TechDraw/App/DrawUtil.h>
 
 using namespace TechDrawGui;
 
@@ -84,8 +84,10 @@ ViewProviderDrawingPage::ViewProviderDrawingPage()
 //    ADD_PROPERTY(HintOffsetY,(10.0));
 
     // do not show this in the property editor
-    Visibility.StatusBits.set(3, true);
-    DisplayMode.StatusBits.set(3, true);
+    //Visibility.StatusBits.set(3, true);
+    //DisplayMode.StatusBits.set(3, true);
+    Visibility.setStatus(App::Property::Hidden,true);
+    DisplayMode.setStatus(App::Property::Hidden,true);
 }
 
 ViewProviderDrawingPage::~ViewProviderDrawingPage()
diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
index 32703e64c..7c77703df 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
@@ -49,7 +49,7 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/ViewProviderDocumentObject.h>
 
-#include <Mod/Drawing/App/DrawProjGroup.h>
+#include <Mod/TechDraw/App/DrawProjGroup.h>
 
 #include "TaskProjGroup.h"
 #include "ViewProviderProjGroup.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp
index c8413e617..8b984a703 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp
@@ -44,7 +44,7 @@
 #include <Gui/SoFCSelection.h>
 
 
-#include <Mod/Drawing/App/DrawProjGroupItem.h>
+#include <Mod/TechDraw/App/DrawProjGroupItem.h>
 
 #include "ViewProviderProjGroupItem.h"
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
index 64e530756..a5987ad20 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
@@ -38,7 +38,7 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawViewSymbol.h>
+#include <Mod/TechDraw/App/DrawViewSymbol.h>
 #include "ViewProviderSymbol.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
index c1cbed9d8..143b3fa13 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
@@ -40,7 +40,7 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawTemplate.h>
+#include <Mod/TechDraw/App/DrawTemplate.h>
 #include "ViewProviderTemplate.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderView.cpp b/src/Mod/TechDraw/Gui/ViewProviderView.cpp
index 0cfdfac02..989cdf2c2 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderView.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderView.cpp
@@ -37,9 +37,9 @@
 #include <App/DocumentObject.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawView.h>
-#include <Mod/Drawing/App/DrawViewClip.h>
-#include <Mod/Drawing/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawView.h>
+#include <Mod/TechDraw/App/DrawViewClip.h>
+#include <Mod/TechDraw/App/DrawPage.h>
 #include "ViewProviderView.h"
 
 
@@ -52,7 +52,8 @@ ViewProviderView::ViewProviderView()
     sPixmap = "View";
 
     // Do not show in property editor
-    DisplayMode.StatusBits.set(3, true);
+    //DisplayMode.StatusBits.set(3, true);
+    DisplayMode.setStatus(App::Property::ReadOnly,true);
 }
 
 ViewProviderView::~ViewProviderView()
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
index 2c5ac4caa..adbaa7785 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
@@ -41,7 +41,7 @@
 //#include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawViewClip.h>
+#include <Mod/TechDraw/App/DrawViewClip.h>
 #include "ViewProviderView.h"
 #include "ViewProviderViewClip.h"
 
@@ -55,7 +55,8 @@ ViewProviderDrawingClip::ViewProviderDrawingClip()
     sPixmap = "actions/techdraw-clip";
 
     // Do not show in property editor
-    DisplayMode.StatusBits.set(3, true);
+    //DisplayMode.StatusBits.set(3, true);
+    DisplayMode.setStatus(App::Property::ReadOnly,true);
 }
 
 ViewProviderDrawingClip::~ViewProviderDrawingClip()
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
index 5c4aeb44b..5dfc651dd 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
@@ -39,11 +39,11 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawViewPart.h>
-#include <Mod/Drawing/App/DrawViewDimension.h>
-#include <Mod/Drawing/App/DrawHatch.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
+#include <Mod/TechDraw/App/DrawViewDimension.h>
+#include <Mod/TechDraw/App/DrawHatch.h>
 
-#include<Mod/Drawing/App/DrawPage.h>
+#include<Mod/TechDraw/App/DrawPage.h>
 #include "ViewProviderViewPart.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
index a94f647df..1d84a4d39 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
@@ -41,7 +41,7 @@
 #include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
-#include <Mod/Drawing/App/DrawView.h>
+#include <Mod/TechDraw/App/DrawView.h>
 #include "ViewProviderViewSection.h"
 
 using namespace TechDrawGui;