diff --git a/src/Base/PyExport.h b/src/Base/PyExport.h
index 05729ea124..b9e599184f 100644
--- a/src/Base/PyExport.h
+++ b/src/Base/PyExport.h
@@ -40,6 +40,15 @@
 #endif
 
 #include <Python.h>
+#ifdef FC_OS_MACOSX
+#undef toupper
+#undef tolower
+#undef isupper
+#undef islower
+#undef isspace
+#undef isalpha
+#undef isalnum
+#endif
 
 namespace Base
 {
diff --git a/src/Base/PyObjectBase.h b/src/Base/PyObjectBase.h
index 3a14bdef95..ec3a316814 100644
--- a/src/Base/PyObjectBase.h
+++ b/src/Base/PyObjectBase.h
@@ -35,7 +35,16 @@
 
 // needed header
 #undef slots
-#   include <Python.h>
+#include <Python.h>
+#ifdef FC_OS_MACOSX
+#undef toupper
+#undef tolower
+#undef isupper
+#undef islower
+#undef isspace
+#undef isalpha
+#undef isalnum
+#endif
 #define slots
 #include <iostream>
 #include <bitset>
diff --git a/src/CXX/WrapPython.h b/src/CXX/WrapPython.h
index 118a8740f8..db159a503f 100644
--- a/src/CXX/WrapPython.h
+++ b/src/CXX/WrapPython.h
@@ -56,5 +56,14 @@
 
 // pull in python definitions
 #include <Python.h>
+#ifdef FC_OS_MACOSX
+#undef toupper
+#undef tolower
+#undef isupper
+#undef islower
+#undef isspace
+#undef isalpha
+#undef isalnum
+#endif
 
 #endif
diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt
index f2639f2a7d..ac445b484b 100644
--- a/src/Doc/CMakeLists.txt
+++ b/src/Doc/CMakeLists.txt
@@ -64,6 +64,7 @@ if(DOXYGEN_FOUND)
                    ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg @ONLY)
 
     if( FREECAD_MAINTAINERS_BUILD )
+        if (WIN32)
         ADD_CUSTOM_TARGET(SourceDocu 
             ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg 
             COMMAND ${QT_HELPCOMPILER_EXECUTABLE} "\"${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qhp\""
@@ -71,6 +72,15 @@ if(DOXYGEN_FOUND)
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
         )
+        else(WIN32)
+        ADD_CUSTOM_TARGET(SourceDocu 
+            ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg 
+            COMMAND ${QT_HELPCOMPILER_EXECUTABLE} "${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qhp"
+            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qch ${CMAKE_BINARY_DIR}/doc/FreeCADSource.qch
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
+        )
+        endif(WIN32)
 
         ADD_CUSTOM_TARGET(UserDocu 
             ${PYTHON_EXECUTABLE}