diff --git a/CMakeLists.txt b/CMakeLists.txt
index f14b0626..7de92cc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ MESSAGE ("\n")
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
-  ${CMAKE_SOURCE_DIR}/src  # for hxx files
 )
 
 
diff --git a/src/doxygen.h b/doxygen.h
similarity index 100%
rename from src/doxygen.h
rename to doxygen.h
diff --git a/src/octomap/OcTreeBase.hxx b/include/octomap/OcTreeBase.hxx
similarity index 100%
rename from src/octomap/OcTreeBase.hxx
rename to include/octomap/OcTreeBase.hxx
diff --git a/src/octomap/OcTreeBaseSE.hxx b/include/octomap/OcTreeBaseSE.hxx
similarity index 100%
rename from src/octomap/OcTreeBaseSE.hxx
rename to include/octomap/OcTreeBaseSE.hxx
diff --git a/src/octomap/OcTreeDataNode.hxx b/include/octomap/OcTreeDataNode.hxx
similarity index 100%
rename from src/octomap/OcTreeDataNode.hxx
rename to include/octomap/OcTreeDataNode.hxx
diff --git a/src/octomap/OcTreeFileIO.hxx b/include/octomap/OcTreeFileIO.hxx
similarity index 100%
rename from src/octomap/OcTreeFileIO.hxx
rename to include/octomap/OcTreeFileIO.hxx
diff --git a/src/octomap/OccupancyOcTreeBase.hxx b/include/octomap/OccupancyOcTreeBase.hxx
similarity index 100%
rename from src/octomap/OccupancyOcTreeBase.hxx
rename to include/octomap/OccupancyOcTreeBase.hxx
diff --git a/src/octomap.dox b/octomap.dox
similarity index 100%
rename from src/octomap.dox
rename to octomap.dox