diff --git a/src/Mod/Drawing/App/PreCompiled.h b/src/Mod/Drawing/App/PreCompiled.h
index ec335eb4f9..c225ce530d 100644
--- a/src/Mod/Drawing/App/PreCompiled.h
+++ b/src/Mod/Drawing/App/PreCompiled.h
@@ -53,6 +53,7 @@
 
 // OpenCasCade =====================================================================================
 // Base
+#include <Standard_Version.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_GUID.hxx>
 #include <Standard_AbortiveTransaction.hxx>
@@ -63,7 +64,6 @@
 #include <Standard_Character.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_ctype.hxx>
 #include <Standard_DefineHandle.hxx>
 #include <Standard_DimensionError.hxx>
 #include <Standard_DimensionMismatch.hxx>
@@ -91,7 +91,6 @@
 #include <Standard_NullObject.hxx>
 #include <Standard_NullValue.hxx>
 #include <Standard_NumericError.hxx>
-#include <Standard_OId.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_OutOfMemory.hxx>
 #include <Standard_OutOfRange.hxx>
@@ -115,6 +114,10 @@
 #include <Standard_Underflow.hxx>
 #include <Standard_UUID.hxx>
 #include <Standard_WayOfLife.hxx>
+#if OCC_VERSION_HEX < 0x060800
+#include <Standard_ctype.hxx>
+#include <Standard_OId.hxx>
+#endif
 
  
 #include <TCollection_ExtendedString.hxx>