diff --git a/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml
index d41200b71..f8e6bddec 100644
--- a/PocoDoc/cfg/mkdoc-poco.xml
+++ b/PocoDoc/cfg/mkdoc-poco.xml
@@ -13,7 +13,22 @@
 				expat*.h,
 				zconf.h,
 				zlib.h,
-				XMLStreamParser.h
+				XMLStreamParser.h,
+				Units.h,
+				AbstractBinder.h,
+				Alignment.h,
+				QName.h,
+				CppUnitException.h,
+				RepeatedTest.h,
+				Test.h,
+				TestCase.h,
+				TestDecorator.h,
+				TestFailure.h,
+				TestResult.h,
+				TestRunner.h,
+				TestSetup.h,
+				TestSuite.h,
+				TextTestResult.h
 			</exclude>
 		</files>
 		<pages>
diff --git a/PocoDoc/cfg/mkdocumentation.xml b/PocoDoc/cfg/mkdocumentation.xml
index 6389a89ef..cb980faf5 100644
--- a/PocoDoc/cfg/mkdocumentation.xml
+++ b/PocoDoc/cfg/mkdocumentation.xml
@@ -13,8 +13,19 @@
 				expat*.h,
 				zconf.h,
 				zlib.h,
-				XMLStreamParser.h
-				${PocoBuild}/Util/include/Poco/Util/Units.h
+				XMLStreamParser.h,
+				Units.h,
+				CppUnitException.h,
+				RepeatedTest.h,
+				Test.h,
+				TestCase.h,
+				TestDecorator.h,
+				TestFailure.h,
+				TestResult.h,
+				TestRunner.h,
+				TestSetup.h,
+				TestSuite.h,
+				TextTestResult.h
 			</exclude>
 		</files>
 		<pages>