diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
index a1f8a8bb6f6f6246edeb670288334a3736f3a8c4..eb7fb3650dfe3044ccabb4e79ab34c88fbea5e41 100644
--- a/Framework/Geometry/CMakeLists.txt
+++ b/Framework/Geometry/CMakeLists.txt
@@ -8,7 +8,7 @@ set_target_properties (CORSIKAgeometry PROPERTIES VERSION ${PROJECT_VERSION})
 set_target_properties (CORSIKAgeometry PROPERTIES SOVERSION 1)
 
 set_target_properties (CORSIKAgeometry PROPERTIES PUBLIC_HEADER "${GEOMETRY_HEADERS}")
-
+                                                    
 # target dependencies on other libraries (also header only)
 target_link_libraries (CORSIKAgeometry CORSIKAunits)
 
@@ -17,7 +17,7 @@ target_include_directories (CORSIKAgeometry INTERFACE ${EIGEN3_INCLUDE_DIR})
 target_include_directories (CORSIKAgeometry INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework>
                                                       $<INSTALL_INTERFACE:include/Framework>
                                                       )
-                                                    
+
 install (TARGETS CORSIKAgeometry
          LIBRARY DESTINATION lib
          ARCHIVE DESTINATION lib
diff --git a/Framework/Geometry/testGeometry.cc b/Framework/Geometry/testGeometry.cc
index d5a34b787708214f95b968f1329ecc75bdf513d8..b85d35327cf2796f1d690d3a33c5cc5e94c9a19c 100644
--- a/Framework/Geometry/testGeometry.cc
+++ b/Framework/Geometry/testGeometry.cc
@@ -1,11 +1,9 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include <ThirdParty/catch2/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Units/PhysicalUnits.h>
 
 using namespace phys::units;
-using namespace phys::units::io;
-using namespace phys::units::literals;
 
 TEST_CASE( "PhysicalUnits", "[Units]" )
 {  
diff --git a/Framework/Units/CMakeLists.txt b/Framework/Units/CMakeLists.txt
index d7d3af7ede19a82ed7805cdce046966beff922cb..7881afc4f9264391915ca73b5a71dd21b06f9054 100644
--- a/Framework/Units/CMakeLists.txt
+++ b/Framework/Units/CMakeLists.txt
@@ -5,7 +5,6 @@ target_include_directories (CORSIKAunits
   INTERFACE
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty>
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:include>
   )
 
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index 91f741a7f09e6f633183b0b354027ac738ec1829..83ed903f9f2ffd7da290349f69daa059aa8d18e8 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -1,16 +1,19 @@
 #ifndef _include_PhysicalUnits_h_
 #define _include_PhysicalUnits_h_
 
-#include <ThirdParty/phys/units/quantity.hpp>
-#include <ThirdParty/phys/units/io.hpp>
-#include <ThirdParty/phys/units/physical_constants.hpp>
+#include <phys/units/quantity.hpp>
+#include <phys/units/io.hpp>
+#include <phys/units/physical_constants.hpp>
 
 /**
-   /file PhysicalUnits
+   @file PhysicalUnits
    
    Define _XeV literals, alowing 10_GeV in the code.     
 */
 
+using namespace phys::units::io;
+using namespace phys::units::literals;
+
 namespace phys {
   namespace units {
     namespace literals {
diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc
index eeae88d0fafa133ef9afce1cc6ece2d8157e8dfc..3206c50951328502350614c244fd5e0e7e35c3b6 100644
--- a/Framework/Units/testUnits.cc
+++ b/Framework/Units/testUnits.cc
@@ -1,11 +1,9 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include <ThirdParty/catch2/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Units/PhysicalUnits.h>
 
 using namespace phys::units;
-using namespace phys::units::io;
-using namespace phys::units::literals;
 
 TEST_CASE( "PhysicalUnits", "[Units]" ) {  
   REQUIRE( 1_m/1_m == 1 );
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 8279a64491b707f5eae89b0404f8ed2ab8cea4e4..c7f90c5b9bdb6ad21d4f918e22a8f973abd838eb 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -1,10 +1,10 @@
 
 add_library (CORSIKAthirdparty INTERFACE)
 
-target_include_directories (CORSIKAthirdparty
+target_include_directories (CORSIKAthirdparty SYSTEM
   INTERFACE
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/>
-  $<INSTALL_INTERFACE:include/>
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty>
+  $<INSTALL_INTERFACE:include/ThirdParty>
   )
 
 install (DIRECTORY phys DESTINATION include/ThirdParty/)