diff --git a/src/bus.hh b/include/bus.hh
similarity index 100%
rename from src/bus.hh
rename to include/bus.hh
diff --git a/src/cpu/cpu.hh b/include/cpu/cpu.hh
similarity index 100%
rename from src/cpu/cpu.hh
rename to include/cpu/cpu.hh
diff --git a/src/cpu/instruction.hh b/include/cpu/instruction.hh
similarity index 100%
rename from src/cpu/instruction.hh
rename to include/cpu/instruction.hh
diff --git a/src/cpu/psr.hh b/include/cpu/psr.hh
similarity index 100%
rename from src/cpu/psr.hh
rename to include/cpu/psr.hh
diff --git a/src/cpu/utility.hh b/include/cpu/utility.hh
similarity index 100%
rename from src/cpu/utility.hh
rename to include/cpu/utility.hh
diff --git a/src/header.hh b/include/header.hh
similarity index 98%
rename from src/header.hh
rename to include/header.hh
index 81ef421..82e803c 100644
--- a/src/header.hh
+++ b/include/header.hh
@@ -2,7 +2,6 @@
 
 #include <cstdint>
 #include <string>
-#include <vector>
 
 struct Header {
     enum class UniqueCode {
diff --git a/src/memory.hh b/include/memory.hh
similarity index 100%
rename from src/memory.hh
rename to include/memory.hh
diff --git a/src/cpu/cpu.cc b/src/cpu/cpu.cc
index e5afd94..a0b05c4 100644
--- a/src/cpu/cpu.cc
+++ b/src/cpu/cpu.cc
@@ -1,7 +1,6 @@
-#include "cpu.hh"
+#include "cpu/cpu.hh"
 #include "util/bits.hh"
 #include "util/log.hh"
-#include "utility.hh"
 #include <algorithm>
 #include <cstdio>
 
diff --git a/src/cpu/instruction.cc b/src/cpu/instruction.cc
index 0ab8cbd..a15e64e 100644
--- a/src/cpu/instruction.cc
+++ b/src/cpu/instruction.cc
@@ -1,4 +1,4 @@
-#include "instruction.hh"
+#include "cpu/instruction.hh"
 #include "util/bits.hh"
 
 ArmInstruction::ArmInstruction(uint32_t insn)
diff --git a/src/cpu/psr.cc b/src/cpu/psr.cc
index 5128baf..30018c9 100644
--- a/src/cpu/psr.cc
+++ b/src/cpu/psr.cc
@@ -1,4 +1,4 @@
-#include "psr.hh"
+#include "cpu/psr.hh"
 #include "util/bits.hh"
 #include "util/log.hh"
 
diff --git a/src/cpu/utility.cc b/src/cpu/utility.cc
index 33e3f8d..569a24d 100644
--- a/src/cpu/utility.cc
+++ b/src/cpu/utility.cc
@@ -1,4 +1,4 @@
-#include "utility.hh"
+#include "cpu/utility.hh"
 #include "util/bits.hh"
 #include <bit>
 
diff --git a/src/meson.build b/src/meson.build
index 7381d51..29253c8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -10,6 +10,7 @@ lib = library(
   meson.project_name(),
   lib_sources,
   dependencies: [fmt],
+  include_directories: inc,
   install: true,
   cpp_args: '-DFMT_HEADER_ONLY'
 )