diff --git a/CMakeLists.txt b/CMakeLists.txt
index 981c2b6..a47c132 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,9 @@ configure_file(${FILE} ${CGEDITOR_INCLUDE_DIR}/${FILE_SUBDIR} COPYONLY)
 endforeach(FILE ${HEADER_FILES})
 
 # Compile cgeditor
-include_directories(src)
 file(GLOB_RECURSE SRC_CPP_FILES src/*.cpp)
 add_library(cgeditor STATIC ${SRC_CPP_FILES})
+target_include_directories(cgeditor PUBLIC ${CGEDITOR_INCLUDE_DIR})
 
 # ChessMoveInterface
 add_subdirectory(libs/chess-move-interface)
diff --git a/src/CGEditor.hpp b/src/CGEditor.hpp
index 7c4372e..e8b5286 100644
--- a/src/CGEditor.hpp
+++ b/src/CGEditor.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Types.hpp"
 #include "components/Margin.hpp"
 #include "components/Menu.hpp"
 #include "components/MoveTable.hpp"