diff --git a/CMakeModules/CorsikaUtilities.cmake b/CMakeModules/CorsikaUtilities.cmake
index bbad9861293041eea3c26658f3a4eecef905a84a..4304dca93c01442d1c6bed50a055d69bcd2a7260 100644
--- a/CMakeModules/CorsikaUtilities.cmake
+++ b/CMakeModules/CorsikaUtilities.cmake
@@ -209,9 +209,9 @@ function (CORSIKA_ADD_EXAMPLE)
     COMMAND ${CMAKE_COMMAND} -E echo ""
     COMMAND ${CMAKE_COMMAND} -E echo "**************************************"
     COMMAND ${CMAKE_COMMAND} -E echo "*****   running example: ${name} " ${run_options} VERBATIM
-    COMMAND gdb -ex "run ${run_options}" -ex bt -ex "info locals" -ex "up" -ex "info locals" \
-                                                -ex "up"-ex "info locals" -ex "up" -ex "info locals" \
-                                                -ex quit ${CMAKE_CURRENT_BINARY_DIR}/${name} \
+    COMMAND gdb -ex "run ${run_options}" -ex bt -ex "info locals" -ex "up" -ex "info locals" 
+                                                -ex "up"-ex "info locals" -ex "up" -ex "info locals" 
+                                                -ex quit ${CMAKE_CURRENT_BINARY_DIR}/${name} 
                                                 VERBATIM
     gdb -ex 'run arg1 arg2' -ex bt -ex quit ./program
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/example_outputs)
diff --git a/Documentation/Doxygen/Doxyfile.in b/Documentation/Doxygen/Doxyfile.in
index 77031e96dc0e9d9f1b17cb4fed4f0e2201deb284..2b6c5cb9df105421e060732801bec496c45be948 100644
--- a/Documentation/Doxygen/Doxyfile.in
+++ b/Documentation/Doxygen/Doxyfile.in
@@ -7,11 +7,11 @@ GENERATE_XML           = YES
 
 OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/
 INPUT                  = @PROJECT_SOURCE_DIR@ @PROJECT_BINARY_DIR@/Framework
-EXCLUDE_PATTERNS       = */ThirdParty/*/*
+EXCLUDE_PATTERNS       = */ThirdParty/*/* */build*/*
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@
 
-FILE_PATTERNS          = *.cc *.cpp *.cxx *.h *.dox *.inc *.md
+FILE_PATTERNS          = *.cc *.cpp *.cxx *.h *.hpp *.dox *.inc *.md
 EXTENSION_MAPPING      = inc=C++
 RECURSIVE              = YES
 
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index d217aa50ba2299136cd8358293be1eb35964e5dd..5c76e008c59d10b239e7395793ec02b5ad8a4e60 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -54,7 +54,6 @@ namespace corsika::particles {
   int constexpr GetNucleusA(Code const);
   int constexpr GetNucleusZ(Code const);
 
-#include <corsika/particles/GeneratedParticleProperties.inc>
 
   /*!
    * returns mass of particle in natural units
@@ -153,3 +152,5 @@ namespace corsika::particles {
   }
 
 } // namespace corsika::particles
+
+#include <corsika/particles/GeneratedParticleProperties.inc>
diff --git a/Framework/Particles/pdxml_reader.py b/Framework/Particles/pdxml_reader.py
index 8c80bec9021cc2f798443c806f7bdd794d0752d5..16978d643142950a52993baab35d69987899a79e 100755
--- a/Framework/Particles/pdxml_reader.py
+++ b/Framework/Particles/pdxml_reader.py
@@ -447,7 +447,8 @@ def gen_classes(particle_db):
 # 
 def inc_start():
     string = ('// generated by pdxml_reader.py\n'
-              '// MANUAL EDITS ON OWN RISK. THEY WILL BE OVERWRITTEN. \n')
+              '// MANUAL EDITS ON OWN RISK. THEY WILL BE OVERWRITTEN. \n'
+              'namespace corsika::particles {\n')
     return string
 
 
@@ -463,14 +464,14 @@ def detail_start():
 # 
 # 
 def detail_end():
-    string = "\n}//end namespace detail\n"
+    string = "\n} // end namespace detail\n"
     return string
 
 ###############################################################
 # 
 # 
 def inc_end():
-    string = ""
+    string = "\n} // end namespace corsika::particles\n"
     return string