diff --git a/src/Mod/Assembly/App/Solver.h b/src/Mod/Assembly/App/Solver.h
index 8867f5eee3..b330d71427 100644
--- a/src/Mod/Assembly/App/Solver.h
+++ b/src/Mod/Assembly/App/Solver.h
@@ -23,6 +23,10 @@
 #ifndef SOLVER_H
 #define SOLVER_H
 
+#include "opendcm/core.hpp"
+#include "opendcm/module3d.hpp"
+#include "opendcm/modulepart.hpp"
+
 #include <Base/Placement.h>
 
 #include <gp_Pnt.hxx>
@@ -30,10 +34,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Cylinder.hxx>
 
-#include "opendcm/core.hpp"
-#include "opendcm/module3d.hpp"
-#include "opendcm/modulepart.hpp"
-
 struct gp_pnt_accessor {
 
     template<typename Scalar, int ID, typename T>
diff --git a/src/Mod/Assembly/CMakeLists.txt b/src/Mod/Assembly/CMakeLists.txt
index 0f3d8eecf3..f4b5f84160 100644
--- a/src/Mod/Assembly/CMakeLists.txt
+++ b/src/Mod/Assembly/CMakeLists.txt
@@ -6,6 +6,10 @@ if(FREECAD_ASSEMBLY_SOLVER_LOGS)
   add_definitions(-DUSE_LOGGING)
 endif(FREECAD_ASSEMBLY_SOLVER_LOGS)
 
+if(MSVC)
+add_definitions(/wd4503)
+endif(MSVC)
+
 add_subdirectory(App)
 if(BUILD_GUI)
     add_subdirectory(Gui)