diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4e746c0..2d2635f05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,41 +6,38 @@ FILE(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH )
 endif(WIN32)
 
 project (eressea-server C)
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 if (MSVC)
-include(MSVC)
+find_package (PDCurses)
+set (CURSES_FOUND ${PDCURSES_FOUND})
+set (CURSES_LIBRARIES ${PDCURSES_LIBRARY})
+set (CURSES_INCLUDE_DIR ${PDCURSES_INCLUDE_DIR})
 set (HAVE_STRDUP 0)
 set (HAVE_STRLCAT 0)
 set (HAVE_LIBBSD 0)
 set (HAVE_SIGNAL_H 0)
 set (HAVE_EXECINFO_H 0)
+include (MSVC)
 else (MSVC)
 
-INCLUDE (CheckIncludeFile)
+find_package (Curses)
+include (CheckIncludeFile)
 CHECK_INCLUDE_FILE(signal.h HAVE_SIGNAL_H)
 CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILE(bsd/string.h HAVE_LIBBSD)
 
-INCLUDE (CheckFunctionExists)
+include (CheckFunctionExists)
 CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP)
-IF (HAVE_LIBBSD)
-INCLUDE (CheckLibraryExists)
+if (HAVE_LIBBSD)
+include (CheckLibraryExists)
 CHECK_LIBRARY_EXISTS(bsd strlcat "bsd/string.h" HAVE_STRLCAT)
-ELSE (HAVE_LIBBSD)
+else (HAVE_LIBBSD)
 CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
-ENDIF(HAVE_LIBBSD)
-
-find_package (PDCurses)
-SET(CURSES_FOUND ${PDCURSES_FOUND})
-SET(CURSES_LIBRARIES ${PDCURSES_LIBRARY})
-SET(CURSES_INCLUDE_DIR ${PDCURSES_INCLUDE_DIR})
-else (MSVC)
-find_package (Curses)
+endif (HAVE_LIBBSD)
 endif (MSVC)
 
-# find_package (Readline)
-find_package (EXPAT REQUIRED)
+find_package (Readline)
 
 if (ERESSEA_DB STREQUAL "db")
 find_package (BerkeleyDB REQUIRED QUIET)
@@ -48,6 +45,7 @@ else()
 find_package (SQLite3 REQUIRED QUIET)
 endif()
 
+find_package(EXPAT REQUIRED)
 find_package (ToLua REQUIRED)
 if (TOLUA_FOUND)
 if (${TOLUA_VERSION_STRING} VERSION_EQUAL "5.2")