diff --git a/Makefile b/Makefile
index 6fe2b9c..c7a46a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 CC = gcc
-CFLAGS = -Iinclude -DMEM_SIZE=32 -DM16_DEBUG_MEM
+CFLAGS = -g -Ilib/include -DMEM_SIZE=32 -DM16_DEBUG_MEM
 LD = $(CC)
 
 PROGRAMS = m16vm as
diff --git a/include/instr.h b/lib/include/instr.h
similarity index 100%
rename from include/instr.h
rename to lib/include/instr.h