diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt
index e3d4bf7684..22edd02422 100644
--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -103,6 +103,9 @@ SET(Assembly_SRCS
 )
 
 add_library(Assembly SHARED ${Assembly_SRCS})
+if(CMAKE_COMPILER_IS_GNUCXX)
+	set_target_properties(Assembly PROPERTIES COMPILE_FLAGS "-fext-numeric-literals")
+endif()
 target_link_libraries(Assembly ${Assembly_LIBS} ${log_LIB})
 
 
diff --git a/src/Mod/Assembly/App/opendcm/module3d/distance.hpp b/src/Mod/Assembly/App/opendcm/module3d/distance.hpp
index 1092318b88..1cba6886e4 100644
--- a/src/Mod/Assembly/App/opendcm/module3d/distance.hpp
+++ b/src/Mod/Assembly/App/opendcm/module3d/distance.hpp
@@ -22,6 +22,7 @@
 
 #include "geometry.hpp"
 #include <opendcm/core/constraint.hpp>
+#include <opendcm/core/imp/kernel_imp.hpp>
 #include <boost/fusion/include/copy.hpp>
 #include <boost/math/special_functions.hpp>
 
diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt
index 9bcb37bb00..b84867d5b4 100644
--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -35,12 +35,20 @@ set(AssemblyGui_MOC_HDRS
 fc_wrap_cpp(AssemblyGui_MOC_SRCS ${AssemblyGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${AssemblyGui_MOC_SRCS})
 
-qt4_add_resources(AssemblyGui_SRCS Resources/Assembly.qrc)
+if (BUILD_QT5)
+	qt5_add_resources(AssemblyGui_SRCS Resources/Assembly.qrc)
+else()
+	qt4_add_resources(AssemblyGui_SRCS Resources/Assembly.qrc)
+endif()
 
 set(AssemblyGui_UIC_SRCS
     #TaskAssemblyConstraints.ui
 )
-qt4_wrap_ui(AssemblyGui_UIC_HDRS ${AssemblyGui_UIC_SRCS})
+if (BUILD_QT5)
+	qt5_wrap_ui(AssemblyGui_UIC_HDRS ${AssemblyGui_UIC_SRCS})
+else()
+	qt4_wrap_ui(AssemblyGui_UIC_HDRS ${AssemblyGui_UIC_SRCS})
+endif()
 
 SET(AssemblyGuiViewProvider_SRCS
     ViewProvider.cpp
@@ -68,7 +76,7 @@ SET(AssemblyGuiModule_SRCS
     Command.cpp
     CommandConstraints.cpp
     Resources/Assembly.qrc
-    qrc_Assembly.cxx
+	#qrc_Assembly.cxx
     PreCompiled.cpp
     PreCompiled.h
     Workbench.cpp
@@ -85,6 +93,9 @@ SET(AssemblyGui_SRCS
 )
 
 add_library(AssemblyGui SHARED ${AssemblyGui_SRCS})
+if(CMAKE_COMPILER_IS_GNUCXX)
+	set_target_properties(AssemblyGui PROPERTIES COMPILE_FLAGS "-fext-numeric-literals")
+endif()
 target_link_libraries(AssemblyGui ${AssemblyGui_LIBS})