diff --git a/src/Base/Builder3D.h b/src/Base/Builder3D.h
index 7e421f1530..59161ecc00 100644
--- a/src/Base/Builder3D.h
+++ b/src/Base/Builder3D.h
@@ -28,7 +28,6 @@
 
 #include <sstream>
 #include <vector>
-#include "Vector3D.h"
 #ifndef FC_GLOBAL_H
 #include <FCGlobal.h>
 #endif
@@ -36,6 +35,9 @@
 namespace Base
 {
 class Matrix4D;
+template <class _Precision> class Vector3;
+typedef Vector3<float>  Vector3f;
+
 /** A Builder class for 3D representations on App level
  * On the application level nothing is known of the visual representation of data.
  * Nevertheless it's often needed to see some 3D information, e.g. points, directions,
diff --git a/src/Base/ExceptionFactory.h b/src/Base/ExceptionFactory.h
index c7b5acc519..5eeedd4f63 100644
--- a/src/Base/ExceptionFactory.h
+++ b/src/Base/ExceptionFactory.h
@@ -24,10 +24,12 @@
 #ifndef BASE_EXCEPTIONFACTORY_H
 #define BASE_EXCEPTIONFACTORY_H
 
-#include <Python.h>
+
 #include "Factory.h"
 #include <typeinfo>
 
+// Python stuff
+typedef struct _object PyObject;
 
 namespace Base
 {
@@ -36,8 +38,7 @@ namespace Base
 class BaseExport AbstractExceptionProducer : public AbstractProducer
 {
 public:
-    AbstractExceptionProducer () {}
-    ~AbstractExceptionProducer() {}
+    AbstractExceptionProducer () = default;
     // just implement it
     void* Produce () const {
         return nullptr;
@@ -59,8 +60,7 @@ public:
 private:
     static ExceptionFactory* _pcSingleton;
 
-    ExceptionFactory(){}
-    ~ExceptionFactory(){}
+    ExceptionFactory() = default;
 };
 
 /* Producers */
diff --git a/src/Base/Factory.h b/src/Base/Factory.h
index 3b59c512f5..9ae760c24c 100644
--- a/src/Base/Factory.h
+++ b/src/Base/Factory.h
@@ -118,7 +118,7 @@ public:
     /// Produce an instance
     virtual void* Produce () const
     {
-        return (void*)mScript;
+        return const_cast<char*>(mScript);
     }
 
 private: