diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b260ff..f5cdaec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,15 +9,15 @@ file(GLOB LIB_SOURCES       "src/lib/*.c")
 file(GLOB AS_SOURCES        "src/as/*.c")
 file(GLOB EMU_SOURCES       "src/emu/*.c")
 
+# Include directories
+include_directories("include/")
+
 # Library for shared code
 add_library(lc3tools ${LIB_SOURCES})
-target_include_directories(lc3tools PUBLIC include)
 
 # Executables
 add_executable(lc3as ${AS_SOURCES})
 add_executable(lc3emu ${EMU_SOURCES})
-target_include_directories(lc3as PRIVATE include/as)
-target_include_directories(lc3emu PRIVATE include/emu)
 
 # Link shared code and executables
 target_link_libraries(lc3as lc3tools)
diff --git a/include/emu/cpu.h b/include/emu/cpu.h
index 9b9efdc..ef1269f 100644
--- a/include/emu/cpu.h
+++ b/include/emu/cpu.h
@@ -22,7 +22,7 @@
 #ifndef __CPU_H
 #define __CPU_H
 
-#include <lc3.h>
+#include <emu/lc3.h>
 
 /*
  * Reset the CPU.
diff --git a/include/emu/disp.h b/include/emu/disp.h
index aac1cce..980952b 100644
--- a/include/emu/disp.h
+++ b/include/emu/disp.h
@@ -22,7 +22,7 @@
 #ifndef __DISP_H
 #define __DISP_H
 
-#include <lc3.h>
+#include <emu/lc3.h>
 
 /*
  * Display IRQ line (interrupt priority).
diff --git a/include/emu/kbd.h b/include/emu/kbd.h
index 0a54c08..138e949 100644
--- a/include/emu/kbd.h
+++ b/include/emu/kbd.h
@@ -22,7 +22,7 @@
 #ifndef __KBD_H
 #define __KBD_H
 
-#include <lc3.h>
+#include <emu/lc3.h>
 
 /*
  * Keyboard IRQ line (interrupt priority).
diff --git a/include/emu/mem.h b/include/emu/mem.h
index 6d846fc..b9e8201 100644
--- a/include/emu/mem.h
+++ b/include/emu/mem.h
@@ -24,7 +24,7 @@
 #ifndef __MEM_H
 #define __MEM_H
 
-#include <lc3.h>
+#include <emu/lc3.h>
 
 /*
  * Memory size in bytes.
diff --git a/include/emu/pic.h b/include/emu/pic.h
index fb3a698..45a45fd 100644
--- a/include/emu/pic.h
+++ b/include/emu/pic.h
@@ -24,7 +24,7 @@
 #ifndef __PIC_H
 #define __PIC_H
 
-#include <lc3.h>
+#include <emu/lc3.h>
 
 /*
  * Device interrupt service routine base vector.
diff --git a/include/emu/state.h b/include/emu/state.h
index a36fb52..e5eb53d 100644
--- a/include/emu/state.h
+++ b/include/emu/state.h
@@ -22,7 +22,7 @@
 #ifndef __STATE_H
 #define __STATE_H
 
-#include <lc3.h>
+#include <emu/lc3.h>
 
 void state_00(void);
 void state_01(void);
diff --git a/src/as/main.c b/src/as/main.c
index 3533a41..f31a692 100644
--- a/src/as/main.c
+++ b/src/as/main.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <lc3as.h>
 #include <lc3tools.h>
+#include <as/lc3as.h>
 
 #define LINE_BUFFER_SIZE    512
 #define TOKEN_BUFFER_SIZE   64
diff --git a/src/emu/cpu.c b/src/emu/cpu.c
index 8eee357..9a18c31 100644
--- a/src/emu/cpu.c
+++ b/src/emu/cpu.c
@@ -23,13 +23,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <lc3.h>
-#include <cpu.h>
-#include <state.h>
-#include <mem.h>
-#include <kbd.h>
-#include <disp.h>
-#include <pic.h>
+#include <emu/lc3.h>
+#include <emu/cpu.h>
+#include <emu/state.h>
+#include <emu/mem.h>
+#include <emu/kbd.h>
+#include <emu/disp.h>
+#include <emu/pic.h>
 
 /******
  * TODO:
diff --git a/src/emu/disp.c b/src/emu/disp.c
index f04d402..ba5af9f 100644
--- a/src/emu/disp.c
+++ b/src/emu/disp.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <disp.h>
-#include <pic.h>
+#include <emu/disp.h>
+#include <emu/pic.h>
 
 #define RD()        (disp.dsr & DSR_RD)
 #define SET_RD(x)   (disp.dsr = (x)?(disp.dsr|DSR_RD):(disp.dsr&~DSR_RD))
diff --git a/src/emu/kbd.c b/src/emu/kbd.c
index 6fd9077..863533d 100644
--- a/src/emu/kbd.c
+++ b/src/emu/kbd.c
@@ -24,8 +24,8 @@
 #include <string.h>
 
 #include <lc3tools.h>
-#include <kbd.h>
-#include <pic.h>
+#include <emu/kbd.h>
+#include <emu/pic.h>
 
 #define RD()        (kbd.kbsr & KBSR_RD)
 #define SET_RD(x)   (kbd.kbsr = (x)?(kbd.kbsr|KBSR_RD):(kbd.kbsr&~KBSR_RD))
diff --git a/src/emu/main.c b/src/emu/main.c
index 2bb51bf..e7f730e 100644
--- a/src/emu/main.c
+++ b/src/emu/main.c
@@ -25,12 +25,12 @@
 #include <string.h>
 
 #include <lc3tools.h>
-#include <lc3.h>
-#include <cpu.h>
-#include <mem.h>
-#include <kbd.h>
-#include <disp.h>
-#include <pic.h>
+#include <emu/lc3.h>
+#include <emu/cpu.h>
+#include <emu/mem.h>
+#include <emu/kbd.h>
+#include <emu/disp.h>
+#include <emu/pic.h>
 
 /* Instruction encodings */
 #define _NOP                0
diff --git a/src/emu/mem.c b/src/emu/mem.c
index b689d62..89e0654 100644
--- a/src/emu/mem.c
+++ b/src/emu/mem.c
@@ -23,11 +23,11 @@
 
 #include <stdio.h>
 
-#include <mem.h>
-#include <cpu.h>
-#include <kbd.h>
-#include <disp.h>
-#include <pic.h>
+#include <emu/mem.h>
+#include <emu/cpu.h>
+#include <emu/kbd.h>
+#include <emu/disp.h>
+#include <emu/pic.h>
 
 /*
  * Overwrite the bits of a value based on a write mask.
diff --git a/src/emu/pic.c b/src/emu/pic.c
index f33accc..ee49ef2 100644
--- a/src/emu/pic.c
+++ b/src/emu/pic.c
@@ -23,8 +23,8 @@
 
 #include <string.h>
 
-#include <pic.h>
-#include <cpu.h>
+#include <emu/pic.h>
+#include <emu/cpu.h>
 
 #define SET_BIT(val,pos)    (val|=(1 <<(pos)))
 #define CLEAR_BIT(val,pos)  (val&=~(1 <<(pos)))