diff --git a/CMakeLists.txt b/CMakeLists.txt
index d94e3bb5..6d7a1e07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,8 +218,8 @@ if (MINGW)
 endif()
 
 # Additional include directories
-include_directories("${CMAKE_SOURCE_DIR}/3rdparty/vec")
-include_directories("${CMAKE_SOURCE_DIR}/3rdparty/smk")
+target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/3rdparty/vec")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smk")
 
 if (ISLE_USE_SMARTHEAP)
   add_library(SmartHeap::SmartHeap STATIC IMPORTED)
diff --git a/LEGO1/tgl.h b/LEGO1/tgl/tgl.h
similarity index 100%
rename from LEGO1/tgl.h
rename to LEGO1/tgl/tgl.h
diff --git a/LEGO1/tglvector.h b/LEGO1/tgl/tglvector.h
similarity index 100%
rename from LEGO1/tglvector.h
rename to LEGO1/tgl/tglvector.h
diff --git a/LEGO1/viewroi.h b/LEGO1/viewroi.h
index 48b1510e..1104e1f5 100644
--- a/LEGO1/viewroi.h
+++ b/LEGO1/viewroi.h
@@ -2,7 +2,7 @@
 #define VIEWROI_H
 
 #include "orientableroi.h"
-#include "tgl.h"
+#include "tgl/tgl.h"
 #include "viewlodlist.h"
 
 /*