diff --git a/CMakeLists.txt b/CMakeLists.txt
index eae4f2a88..6458e7b5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,7 @@ endif(TOLUA_FOUND)
 enable_testing()
 
 add_subdirectory (tolua)
+add_subdirectory (tools)
 add_subdirectory (storage)
 add_subdirectory (clibs)
 add_subdirectory (process)
diff --git a/s/travis-build b/s/travis-build
index 7bbfbe85a..e326d7b10 100755
--- a/s/travis-build
+++ b/s/travis-build
@@ -6,7 +6,7 @@ inifile() {
 cd $ROOT
 if [ ! -e eressea.ini ]; then
 cp conf/eressea.ini .
-$BUILD/iniparser/inifile eressea.ini add lua:paths lunit:scripts
+$BUILD/tools/inifile eressea.ini add lua:paths lunit:scripts
 fi
 }
 
diff --git a/src/util/base36.c b/src/util/base36.c
index 85f2cc80d..edec82f62 100644
--- a/src/util/base36.c
+++ b/src/util/base36.c
@@ -1,10 +1,9 @@
-#include <platform.h>
 #include "base36.h"
 #include "log.h"
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 #include <ctype.h>
 
 #define USE_STRTOL
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 000000000..75746be2c
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.9)
+project (tools C)
+
+add_executable(inifile inifile.c)
+target_link_libraries(inifile ${IniParser_LIBRARIES})
+target_include_directories (inifile PRIVATE ${IniParser_INCLUDE_DIRS})
+
+add_executable(gethash gethash.c)
+
+add_executable(atoi36 atoi36.c ${CMAKE_SOURCE_DIR}/src/util/base36.c)
+target_include_directories(atoi36 PRIVATE ${CMAKE_SOURCE_DIR}/src/util)
diff --git a/src/tools/atoi36.c b/tools/atoi36.c
similarity index 100%
rename from src/tools/atoi36.c
rename to tools/atoi36.c
diff --git a/src/tools/gethash.c b/tools/gethash.c
similarity index 100%
rename from src/tools/gethash.c
rename to tools/gethash.c
diff --git a/src/tools/inifile.c b/tools/inifile.c
similarity index 100%
rename from src/tools/inifile.c
rename to tools/inifile.c
diff --git a/src/tools/namegen.c b/tools/namegen.c
similarity index 100%
rename from src/tools/namegen.c
rename to tools/namegen.c