diff --git a/src/App/DocumentPyImp.cpp b/src/App/DocumentPyImp.cpp
index fe8a33368..8167c5493 100644
--- a/src/App/DocumentPyImp.cpp
+++ b/src/App/DocumentPyImp.cpp
@@ -29,7 +29,6 @@
 
 #include "Document.h"
 #include <Base/FileInfo.h>
-#include <Base/PyTools.h>
 #include "DocumentObject.h"
 #include "DocumentObjectPy.h"
 
diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp
index b5f4f0f27..9ee45b8f6 100644
--- a/src/Base/Interpreter.cpp
+++ b/src/Base/Interpreter.cpp
@@ -26,7 +26,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#   include <Python.h>
 #   include <sstream>
 #   include <boost/regex.hpp>
 #endif
diff --git a/src/Base/Interpreter.h b/src/Base/Interpreter.h
index fb61ccb73..a5b6ac9e9 100644
--- a/src/Base/Interpreter.h
+++ b/src/Base/Interpreter.h
@@ -35,6 +35,16 @@
 
 #include <Python.h>
 
+#ifdef FC_OS_MACOSX
+#undef toupper
+#undef tolower
+#undef isupper
+#undef islower
+#undef isspace
+#undef isalpha
+#undef isalnum
+#endif
+
 // Std. configurations
 #include <string>
 #include <map>
diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h
index c50e1595a..8c0100bcb 100644
--- a/src/Base/Parameter.h
+++ b/src/Base/Parameter.h
@@ -36,9 +36,21 @@
 
 // Include files
 #include <Python.h>
+
+#ifdef FC_OS_MACOSX
+#undef toupper
+#undef tolower
+#undef isupper
+#undef islower
+#undef isspace
+#undef isalpha
+#undef isalnum
+#endif
+
 #ifdef FC_OS_LINUX
 #include <sstream>
 #endif
+
 #include <map>
 #include <vector>
 #include <xercesc/util/XercesDefs.hpp>
diff --git a/src/Base/UnitsApi.h b/src/Base/UnitsApi.h
index 153cd93ad..3669d313e 100644
--- a/src/Base/UnitsApi.h
+++ b/src/Base/UnitsApi.h
@@ -24,16 +24,8 @@
 #ifndef BASE_UNITSAPI_H
 #define BASE_UNITSAPI_H
 
-// (re-)defined in pyconfig.h
-#if defined (_POSIX_C_SOURCE)
-#   undef    _POSIX_C_SOURCE
-#endif
-#if defined (_XOPEN_SOURCE)
-#   undef    _XOPEN_SOURCE
-#endif
-
+#include <CXX/WrapPython.h>
 #include <string>
-#include <Python.h>
 #include <QString>
 #include "UnitsSchema.h"
 #include "Quantity.h"
diff --git a/src/Base/UnitsApiPy.cpp b/src/Base/UnitsApiPy.cpp
index 7d41fe266..cccfdc0d8 100644
--- a/src/Base/UnitsApiPy.cpp
+++ b/src/Base/UnitsApiPy.cpp
@@ -24,7 +24,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Python.h>
 #endif
 
 #include <CXX/Objects.hxx>
diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp
index 69dd54610..0bb0e2b43 100644
--- a/src/Gui/Splashscreen.cpp
+++ b/src/Gui/Splashscreen.cpp
@@ -23,7 +23,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Python.h>
 # include <QApplication>
 # include <QClipboard>
 # include <QDialogButtonBox>
@@ -38,6 +37,7 @@
 #include "Splashscreen.h"
 #include "ui_AboutApplication.h"
 #include <Base/Console.h>
+#include <CXX/WrapPython.h>
 #include <App/Application.h>
 #include <Gui/MainWindow.h>
 
diff --git a/src/Main/FreeCADGuiPy.cpp b/src/Main/FreeCADGuiPy.cpp
index 35631e47a..0abeb9072 100644
--- a/src/Main/FreeCADGuiPy.cpp
+++ b/src/Main/FreeCADGuiPy.cpp
@@ -27,7 +27,6 @@
 #   include <config.h>
 #endif // HAVE_CONFIG_H
 
-#include <Python.h>
 #include <QApplication>
 #include <QIcon>
 #include <QThread>
@@ -37,6 +36,7 @@
 #include <QX11EmbedWidget>
 #endif
 // FreeCAD Base header
+#include <CXX/WrapPython.h>
 #include <Base/Exception.h>
 #include <Base/Factory.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp
index 7abc96570..79e2aea8c 100644
--- a/src/Mod/Part/Gui/DlgPrimitives.cpp
+++ b/src/Mod/Part/Gui/DlgPrimitives.cpp
@@ -23,7 +23,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <Python.h>
 #include <gp_Ax1.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Dir.hxx>
@@ -37,6 +36,7 @@
 #include <Inventor/events/SoMouseButtonEvent.h>
 #endif
 
+#include <CXX/WrapPython.h>
 #include <Base/Interpreter.h>
 #include <Base/Rotation.h>
 #include <Base/Tools.h>