diff --git a/src/Base/Console.cpp b/src/Base/Console.cpp
index c47c07b7eb..e03a4acc36 100644
--- a/src/Base/Console.cpp
+++ b/src/Base/Console.cpp
@@ -34,8 +34,8 @@
 
 #include "Console.h"
 #include "Exception.h"
-#include "frameobject.h"
 #include "PyObjectBase.h"
+#include "frameobject.h"
 #include <QCoreApplication>
 
 
diff --git a/src/Base/Console.h b/src/Base/Console.h
index 8add3ee542..4e4ef30ddc 100644
--- a/src/Base/Console.h
+++ b/src/Base/Console.h
@@ -21,18 +21,24 @@
  *                                                                         *
  ***************************************************************************/
 
-#pragma once
+
+
+
+#ifndef BASE_CONSOLE_H
+#define BASE_CONSOLE_H
 
 // Std. configurations
-#include <Base/PyExport.h>
 #include <Base/Stream.h>
-//#pragma warning(disable: 4786)  // specifier longer then 255 chars
 #include <chrono>
 #include <map>
 #include <set>
 #include <string>
 #include <sstream>
 
+// Python stuff
+typedef struct _object PyObject;
+typedef struct PyMethodDef PyMethodDef;
+
 //FIXME: ISO C++11 requires at least one argument for the "..." in a variadic macro
 #if defined(__clang__)
 # pragma clang diagnostic push
@@ -747,3 +753,5 @@ private:
 #if defined(__clang__)
 # pragma clang diagnostic pop
 #endif
+
+#endif // BASE_CONSOLE_H
diff --git a/src/Base/Observer.h b/src/Base/Observer.h
index a03aa6a67c..97bd4e464c 100644
--- a/src/Base/Observer.h
+++ b/src/Base/Observer.h
@@ -26,6 +26,7 @@
 #define BASE_OBSERVER_H
 
 #include <cassert>
+#include <cstring>
 #include <set>
 #include "Console.h"
 #include "Exception.h"
diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h
index bf591c70a6..0cbad8c344 100644
--- a/src/Base/Parameter.h
+++ b/src/Base/Parameter.h
@@ -32,6 +32,9 @@
 #ifndef BASE__PARAMETER_H
 #define BASE__PARAMETER_H
 
+ // Python stuff
+typedef struct _object PyObject;
+
 #ifdef FC_OS_MACOSX
 #undef toupper
 #undef tolower
diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp
index f48986161e..b574adad6d 100644
--- a/src/Base/UnitsApi.cpp
+++ b/src/Base/UnitsApi.cpp
@@ -26,6 +26,7 @@
 # include <unistd.h>
 #endif
 
+#include <CXX/WrapPython.h>
 #include <memory>
 #include <QString>
 #include "Exception.h"
diff --git a/src/Base/UnitsApi.h b/src/Base/UnitsApi.h
index 74668f84b1..4bef37c86a 100644
--- a/src/Base/UnitsApi.h
+++ b/src/Base/UnitsApi.h
@@ -24,12 +24,13 @@
 #ifndef BASE_UNITSAPI_H
 #define BASE_UNITSAPI_H
 
-#include <CXX/WrapPython.h>
 #include <memory>
 #include <QString>
 #include "UnitsSchema.h"
 #include "Quantity.h"
 
+typedef struct _object PyObject;
+typedef struct PyMethodDef PyMethodDef;
 
 namespace Base {
 typedef std::unique_ptr<UnitsSchema> UnitsSchemaPtr;