diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01ca5846..ad927ed6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -567,8 +567,8 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 			list(APPEND DOXY_INPUT "\"${F}\"")
 		endforeach(F)
 		string(REPLACE ";" " " DOXY_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/libs\"")
-		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${DOXY_INPUT}")
-		string(REPLACE ";" " " DOXY_DEFINES "${PIP_EXPORTS};DOXYGEN;PIOBJECT;PIOBJECT_SUBCLASS")
+		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${PIP_INCLUDES}")
+		string(REPLACE ";" " " DOXY_DEFINES "${PIP_EXPORTS}")
 		add_documentation(doc doc/Doxyfile.in)
 		install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ../share/doc/pip COMPONENT doc EXCLUDE_FROM_ALL OPTIONAL)
 	endif()
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 3b86bb79..7b0fde56 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -2164,7 +2164,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = ${DOXY_DEFINES}
+PREDEFINED             =  DOXYGEN PIOBJECT PIOBJECT_SUBCLASS PIIODEVICE NO_COPY_CLASS ${DOXY_DEFINES}
 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/libs/main/code/picodeparser.cpp b/libs/main/code/picodeparser.cpp
index 399960d5..79cd8c8f 100644
--- a/libs/main/code/picodeparser.cpp
+++ b/libs/main/code/picodeparser.cpp
@@ -193,6 +193,9 @@ void PICodeParser::clear() {
 	macros << Macro(PIStringAscii("PIOBJECT"), "", PIStringList() << "name")
 		   << Macro(PIStringAscii("PIOBJECT_PARENT"), "", PIStringList() << "parent")
 		   << Macro(PIStringAscii("PIOBJECT_SUBCLASS"), "", PIStringList() << "name" << "parent")
+		   << Macro(PIStringAscii("PIIODEVICE"), "", PIStringList() << "name")
+		   << Macro(PIStringAscii("NO_COPY_CLASS"), "", PIStringList() << "name")
+		   << Macro(PIStringAscii("PRIVATE_DECLARATION"))
 
 		   << Macro(PIStringAscii("EVENT" ), "void name();", PIStringList() << "name")
 		   << Macro(PIStringAscii("EVENT0"), "void name();", PIStringList() << "name")