diff --git a/CMakeLists.txt b/CMakeLists.txt
index 612d65b..dd164a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,7 +159,7 @@ endif(ENABLE_REDIS)
 
 include_directories(
 	"${PROJECT_BINARY_DIR}"
-	"${CMAKE_CURRENT_SOURCE_DIR}"
+	"${CMAKE_CURRENT_SOURCE_DIR}/include"
 	"${CMAKE_CURRENT_BINARY_DIR}"
 	${SQLITE3_INCLUDE_DIR}
 	${LIBGD_INCLUDE_DIR}
@@ -167,7 +167,7 @@ include_directories(
 )
 
 configure_file(
-	"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
+	"${PROJECT_SOURCE_DIR}/include/cmake_config.h.in"
 	"${PROJECT_BINARY_DIR}/cmake_config.h"
 )
 add_definitions ( -DUSE_CMAKE_CONFIG_H )
diff --git a/Image.h b/include/Image.h
similarity index 100%
rename from Image.h
rename to include/Image.h
diff --git a/PixelAttributes.h b/include/PixelAttributes.h
similarity index 100%
rename from PixelAttributes.h
rename to include/PixelAttributes.h
diff --git a/PlayerAttributes.h b/include/PlayerAttributes.h
similarity index 100%
rename from PlayerAttributes.h
rename to include/PlayerAttributes.h
diff --git a/TileGenerator.h b/include/TileGenerator.h
similarity index 100%
rename from TileGenerator.h
rename to include/TileGenerator.h
diff --git a/ZlibDecompressor.h b/include/ZlibDecompressor.h
similarity index 100%
rename from ZlibDecompressor.h
rename to include/ZlibDecompressor.h
diff --git a/cmake_config.h.in b/include/cmake_config.h.in
similarity index 100%
rename from cmake_config.h.in
rename to include/cmake_config.h.in
diff --git a/config.h b/include/config.h
similarity index 100%
rename from config.h
rename to include/config.h
diff --git a/db-leveldb.h b/include/db-leveldb.h
similarity index 100%
rename from db-leveldb.h
rename to include/db-leveldb.h
diff --git a/db-postgresql.h b/include/db-postgresql.h
similarity index 100%
rename from db-postgresql.h
rename to include/db-postgresql.h
diff --git a/db-redis.h b/include/db-redis.h
similarity index 100%
rename from db-redis.h
rename to include/db-redis.h
diff --git a/db-sqlite3.h b/include/db-sqlite3.h
similarity index 100%
rename from db-sqlite3.h
rename to include/db-sqlite3.h
diff --git a/db.h b/include/db.h
similarity index 100%
rename from db.h
rename to include/db.h
diff --git a/types.h b/include/types.h
similarity index 100%
rename from types.h
rename to include/types.h
diff --git a/util.h b/include/util.h
similarity index 100%
rename from util.h
rename to include/util.h