diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71ed21f..6e007d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,6 @@ else ()
     set (CMAKE_CXX_STANDARD 14)
 endif ()
 
-# Add all include directories
-include_directories(include/ ${SIMPLE_LOGGER_SRC})
 # Add paths for linker
 link_directories(${SIMPLE_LOGGER_BIN})
 
@@ -37,3 +35,4 @@ file(GLOB sources_65816 src/*.cpp src/opcodes/*.cpp)
 add_library(65816 ${sources_65816})
 add_dependencies(65816 simple-logger)
 target_link_libraries(65816 simpleLogger)
+target_include_directories(65816 PRIVATE ${PROJECT_SOURCE_DIR}/include ${SIMPLE_LOGGER_SRC})
diff --git a/src/Addressing.cpp b/src/Addressing.cpp
index 8647801..a65ce54 100644
--- a/src/Addressing.cpp
+++ b/src/Addressing.cpp
@@ -17,7 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Cpu65816.hpp"
+#include <Cpu65816.hpp>
+#include <OpCode.hpp>
+#include <SystemBusDevice.hpp>
 
 #define LOG_TAG "Addressing"