diff --git a/Call.cpp b/Call.cpp
index 80f4a07..ad8df87 100644
--- a/Call.cpp
+++ b/Call.cpp
@@ -1,4 +1,4 @@
-#include "Call.h"
+#include "elfspy/Call.h"
 
 namespace spy
 {
diff --git a/GOTEntry.cpp b/GOTEntry.cpp
index 7e7c491..0623ef1 100644
--- a/GOTEntry.cpp
+++ b/GOTEntry.cpp
@@ -1,4 +1,4 @@
-#include "GOTEntry.h"
+#include "elfspy/GOTEntry.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/Arg.h b/elfspy/Arg.h
similarity index 100%
rename from Arg.h
rename to elfspy/Arg.h
diff --git a/Call.h b/elfspy/Call.h
similarity index 100%
rename from Call.h
rename to elfspy/Call.h
diff --git a/Capture.h b/elfspy/Capture.h
similarity index 100%
rename from Capture.h
rename to elfspy/Capture.h
diff --git a/ELFInfo.h b/elfspy/ELFInfo.h
similarity index 100%
rename from ELFInfo.h
rename to elfspy/ELFInfo.h
diff --git a/ELFObject.h b/elfspy/ELFObject.h
similarity index 100%
rename from ELFObject.h
rename to elfspy/ELFObject.h
diff --git a/Error.h b/elfspy/Error.h
similarity index 100%
rename from Error.h
rename to elfspy/Error.h
diff --git a/Fail.h b/elfspy/Fail.h
similarity index 100%
rename from Fail.h
rename to elfspy/Fail.h
diff --git a/Fake.h b/elfspy/Fake.h
similarity index 100%
rename from Fake.h
rename to elfspy/Fake.h
diff --git a/Function.h b/elfspy/Function.h
similarity index 100%
rename from Function.h
rename to elfspy/Function.h
diff --git a/GOTEntry.h b/elfspy/GOTEntry.h
similarity index 100%
rename from GOTEntry.h
rename to elfspy/GOTEntry.h
diff --git a/Hook.h b/elfspy/Hook.h
similarity index 100%
rename from Hook.h
rename to elfspy/Hook.h
diff --git a/HookBase.h b/elfspy/HookBase.h
similarity index 100%
rename from HookBase.h
rename to elfspy/HookBase.h
diff --git a/HookImpl.h b/elfspy/HookImpl.h
similarity index 100%
rename from HookImpl.h
rename to elfspy/HookImpl.h
diff --git a/Lambda.h b/elfspy/Lambda.h
similarity index 100%
rename from Lambda.h
rename to elfspy/Lambda.h
diff --git a/MFile.h b/elfspy/MFile.h
similarity index 100%
rename from MFile.h
rename to elfspy/MFile.h
diff --git a/Method.h b/elfspy/Method.h
similarity index 100%
rename from Method.h
rename to elfspy/Method.h
diff --git a/MethodInfo.h b/elfspy/MethodInfo.h
similarity index 100%
rename from MethodInfo.h
rename to elfspy/MethodInfo.h
diff --git a/MethodPointer.h b/elfspy/MethodPointer.h
similarity index 100%
rename from MethodPointer.h
rename to elfspy/MethodPointer.h
diff --git a/Profiler.h b/elfspy/Profiler.h
similarity index 100%
rename from Profiler.h
rename to elfspy/Profiler.h
diff --git a/Report.h b/elfspy/Report.h
similarity index 100%
rename from Report.h
rename to elfspy/Report.h
diff --git a/Result.h b/elfspy/Result.h
similarity index 100%
rename from Result.h
rename to elfspy/Result.h
diff --git a/SPY.h b/elfspy/SPY.h
similarity index 100%
rename from SPY.h
rename to elfspy/SPY.h
diff --git a/Section.h b/elfspy/Section.h
similarity index 100%
rename from Section.h
rename to elfspy/Section.h
diff --git a/SectionHeader.h b/elfspy/SectionHeader.h
similarity index 100%
rename from SectionHeader.h
rename to elfspy/SectionHeader.h
diff --git a/Thunk.h b/elfspy/Thunk.h
similarity index 100%
rename from Thunk.h
rename to elfspy/Thunk.h
diff --git a/ThunkHandle.h b/elfspy/ThunkHandle.h
similarity index 100%
rename from ThunkHandle.h
rename to elfspy/ThunkHandle.h
diff --git a/Variadic.h b/elfspy/Variadic.h
similarity index 100%
rename from Variadic.h
rename to elfspy/Variadic.h
diff --git a/meson.build b/meson.build
index d7c5753..003bff8 100644
--- a/meson.build
+++ b/meson.build
@@ -14,39 +14,39 @@ sources = [
 ]
 
 headers = [
-    './Capture.h',
-    './HookImpl.h',
-    './Thunk.h',
-    './MFile.h',
-    './Lambda.h',
-    './Method.h',
-    './Profiler.h',
-    './GOTEntry.h',
-    './MethodInfo.h',
-    './Section.h',
-    './ELFObject.h',
-    './Call.h',
-    './SectionHeader.h',
-    './Variadic.h',
-    './MethodPointer.h',
-    './Fail.h',
-    './Result.h',
-    './ThunkHandle.h',
-    './Report.h',
-    './SPY.h',
-    './Fake.h',
-    './Error.h',
-    './Hook.h',
-    './ELFInfo.h',
-    './Function.h',
-    './HookBase.h',
-    './Arg.h',
+    './elfspy/Capture.h',
+    './elfspy/HookImpl.h',
+    './elfspy/Thunk.h',
+    './elfspy/MFile.h',
+    './elfspy/Lambda.h',
+    './elfspy/Method.h',
+    './elfspy/Profiler.h',
+    './elfspy/GOTEntry.h',
+    './elfspy/MethodInfo.h',
+    './elfspy/Section.h',
+    './elfspy/ELFObject.h',
+    './elfspy/Call.h',
+    './elfspy/SectionHeader.h',
+    './elfspy/Variadic.h',
+    './elfspy/MethodPointer.h',
+    './elfspy/Fail.h',
+    './elfspy/Result.h',
+    './elfspy/ThunkHandle.h',
+    './elfspy/Report.h',
+    './elfspy/SPY.h',
+    './elfspy/Fake.h',
+    './elfspy/Error.h',
+    './elfspy/Hook.h',
+    './elfspy/ELFInfo.h',
+    './elfspy/Function.h',
+    './elfspy/HookBase.h',
+    './elfspy/Arg.h',
 ]
 
 elfspylib = library('elfspy',
     sources,
     install : true,
-    include_directories: ['.', '..'],
+    include_directories: ['.'],
     c_args: ['-fPIC', '-O0', '-g'],
 )
 install_headers(headers, subdir: 'elfspy')