18 files changed, 22 insertions, 16 deletions
diff --git a/kms++util/CMakeLists.txt b/kms++util/CMakeLists.txt
index 533b446..3977f70 100644
--- a/kms++util/CMakeLists.txt
+++ b/kms++util/CMakeLists.txt
@@ -1,5 +1,9 @@
-file(GLOB SRCS "*.cpp" "*.h")
+file(GLOB SRCS "src/*.cpp" "src/*.h" "inc/kms++util/*.h")
 add_library(kms++util ${SRCS})
 
+target_include_directories(kms++util PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+    $<INSTALL_INTERFACE:include>
+    PRIVATE src)
+
 target_link_libraries(kms++util kms++ pthread)
-target_include_directories(kms++util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/kms++util/color.h b/kms++util/inc/kms++util/color.h
index ef85a67..ef85a67 100644
--- a/kms++util/color.h
+++ b/kms++util/inc/kms++util/color.h
diff --git a/kms++util/cpuframebuffer.h b/kms++util/inc/kms++util/cpuframebuffer.h
index 1498528..1498528 100644
--- a/kms++util/cpuframebuffer.h
+++ b/kms++util/inc/kms++util/cpuframebuffer.h
diff --git a/kms++util/extcpuframebuffer.h b/kms++util/inc/kms++util/extcpuframebuffer.h
index 5d3be74..5d3be74 100644
--- a/kms++util/extcpuframebuffer.h
+++ b/kms++util/inc/kms++util/extcpuframebuffer.h
diff --git a/kms++util/kms++util.h b/kms++util/inc/kms++util/kms++util.h
index 0c07d18..ca3c406 100644
--- a/kms++util/kms++util.h
+++ b/kms++util/inc/kms++util/kms++util.h
@@ -2,7 +2,13 @@
 
 #include <kms++/kms++.h>
 
-#include "color.h"
+#include <kms++util/color.h>
+#include <kms++util/strhelpers.h>
+#include <kms++util/cpuframebuffer.h>
+#include <kms++util/extcpuframebuffer.h>
+#include <kms++util/stopwatch.h>
+#include <kms++util/opts.h>
+
 #include <cstdio>
 #include <cstdlib>
 
diff --git a/kms++util/opts.h b/kms++util/inc/kms++util/opts.h
index 1b0fd22..1b0fd22 100644
--- a/kms++util/opts.h
+++ b/kms++util/inc/kms++util/opts.h
diff --git a/kms++util/stopwatch.h b/kms++util/inc/kms++util/stopwatch.h
index 9b60fa1..9b60fa1 100644
--- a/kms++util/stopwatch.h
+++ b/kms++util/inc/kms++util/stopwatch.h
diff --git a/kms++util/strhelpers.h b/kms++util/inc/kms++util/strhelpers.h
index 2c540f3..2c540f3 100644
--- a/kms++util/strhelpers.h
+++ b/kms++util/inc/kms++util/strhelpers.h
diff --git a/kms++util/color.cpp b/kms++util/src/color.cpp
index 490ff64..4bfc33e 100644
--- a/kms++util/color.cpp
+++ b/kms++util/src/color.cpp
@@ -1,4 +1,4 @@
-#include "color.h"
+#include <kms++util/color.h>
 
 namespace kms
 {
diff --git a/kms++util/colorbar.cpp b/kms++util/src/colorbar.cpp
index 9e6e68d..bca8dc6 100644
--- a/kms++util/colorbar.cpp
+++ b/kms++util/src/colorbar.cpp
@@ -1,7 +1,7 @@
 #include <cstdint>
 
 #include <kms++/kms++.h>
-#include "kms++util.h"
+#include <kms++util/kms++util.h>
 
 namespace kms
 {
diff --git a/kms++util/cpuframebuffer.cpp b/kms++util/src/cpuframebuffer.cpp
index 1f14ddc..d356596 100644
--- a/kms++util/cpuframebuffer.cpp
+++ b/kms++util/src/cpuframebuffer.cpp
@@ -1,6 +1,6 @@
 #include <map>
 
-#include "cpuframebuffer.h"
+#include <kms++util/cpuframebuffer.h>
 
 using namespace std;
 
diff --git a/kms++util/drawing.cpp b/kms++util/src/drawing.cpp
index 2ca567c..a5377be 100644
--- a/kms++util/drawing.cpp
+++ b/kms++util/src/drawing.cpp
@@ -1,6 +1,6 @@
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
diff --git a/kms++util/extcpuframebuffer.cpp b/kms++util/src/extcpuframebuffer.cpp
index bd0b10c..232c778 100644
--- a/kms++util/extcpuframebuffer.cpp
+++ b/kms++util/src/extcpuframebuffer.cpp
@@ -1,6 +1,5 @@
 
-#include "extcpuframebuffer.h"
-#include "kms++util.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
diff --git a/kms++util/font_8x8.h b/kms++util/src/font_8x8.h
index 2a2a1ea..2a2a1ea 100644
--- a/kms++util/font_8x8.h
+++ b/kms++util/src/font_8x8.h
diff --git a/kms++util/helpers.cpp b/kms++util/src/helpers.cpp
index 4aa3194..2bf3a4f 100644
--- a/kms++util/helpers.cpp
+++ b/kms++util/src/helpers.cpp
@@ -1,5 +1,4 @@
-#include "kms++util.h"
-#include "strhelpers.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
diff --git a/kms++util/opts.cpp b/kms++util/src/opts.cpp
index 4ea31f8..afef452 100644
--- a/kms++util/opts.cpp
+++ b/kms++util/src/opts.cpp
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include "opts.h"
+#include <kms++util/opts.h>
 
 using namespace std;
 
diff --git a/kms++util/strhelpers.cpp b/kms++util/src/strhelpers.cpp
index f18c749..f59bb6d 100644
--- a/kms++util/strhelpers.cpp
+++ b/kms++util/src/strhelpers.cpp
@@ -1,4 +1,4 @@
-#include "strhelpers.h"
+#include <kms++util/strhelpers.h>
 
 #include <algorithm>
 #include <stdarg.h>
diff --git a/kms++util/testpat.cpp b/kms++util/src/testpat.cpp
index 7a2e4d3..cbe611d 100644
--- a/kms++util/testpat.cpp
+++ b/kms++util/src/testpat.cpp
@@ -6,9 +6,7 @@
 #include <thread>
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
-#include <cpuframebuffer.h>
-#include "stopwatch.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;