diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1407080..fdfb467 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,8 @@ set(CCD_INCLUDES
   ccd/compiler.h
   ccd/ccd_export.h
   ccd/quat.h
+  ccd/simplex.h
+  ccd/support.h
   ccd/vec3.h
   "${CMAKE_CURRENT_BINARY_DIR}/ccd/config.h")
 
@@ -34,9 +36,7 @@ set(CCD_SOURCES
   mpr.c
   polytope.c
   polytope.h
-  simplex.h
   support.c
-  support.h
   vec3.c)
 
 add_library(ccd ${CCD_INCLUDES} ${CCD_SOURCES})
diff --git a/src/Makefile.am b/src/Makefile.am
index 53b433a..d0118f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,8 @@ libccd_la_SOURCES = alloc.h \
 		list.h \
 		polytope.c polytope.h \
 		ccd/quat.h \
-		simplex.h \
-		support.c support.h \
+		ccd/simplex.h \
+		support.c ccd/support.h \
 		vec3.c ccd/vec3.h \
         mpr.c
 
diff --git a/src/ccd.c b/src/ccd.c
index 23b63c0..489c498 100644
--- a/src/ccd.c
+++ b/src/ccd.c
@@ -19,7 +19,7 @@
 #include <float.h>
 #include <ccd/ccd.h>
 #include <ccd/vec3.h>
-#include "simplex.h"
+#include <ccd/simplex.h>
 #include "polytope.h"
 #include "alloc.h"
 #include "dbg.h"
diff --git a/src/simplex.h b/src/ccd/simplex.h
similarity index 99%
rename from src/simplex.h
rename to src/ccd/simplex.h
index 8ae09c7..cefd8d7 100644
--- a/src/simplex.h
+++ b/src/ccd/simplex.h
@@ -19,7 +19,7 @@
 #define __CCD_SIMPLEX_H__
 
 #include <ccd/compiler.h>
-#include "support.h"
+#include <ccd/support.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/support.h b/src/ccd/support.h
similarity index 100%
rename from src/support.h
rename to src/ccd/support.h
diff --git a/src/mpr.c b/src/mpr.c
index 2ad6c87..6723aee 100644
--- a/src/mpr.c
+++ b/src/mpr.c
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 #include <ccd/ccd.h>
-#include "simplex.h"
+#include <ccd/simplex.h>
 #include "dbg.h"
 
 /** Finds origin (center) of Minkowski difference (actually it can be any
diff --git a/src/polytope.h b/src/polytope.h
index f721e64..1d33663 100644
--- a/src/polytope.h
+++ b/src/polytope.h
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "support.h"
+#include <ccd/support.h>
 #include "list.h"
 
 #ifdef __cplusplus
diff --git a/src/support.c b/src/support.c
index 6c7f1cc..32aefe9 100644
--- a/src/support.c
+++ b/src/support.c
@@ -15,7 +15,7 @@
  *  See the License for more information.
  */
 
-#include "support.h"
+#include <ccd/support.h>
 
 void __ccdSupport(const void *obj1, const void *obj2,
                   const ccd_vec3_t *_dir, const ccd_t *ccd,