diff --git a/CMakeLists.txt b/CMakeLists.txt
index f89f840af..bdc94351d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,14 +21,26 @@ if (WIN32)
 else (WIN32)
   include_directories (/usr/include/lua5.1/ /usr/include/libxml2)
 endif (WIN32)
-include_directories (../external ../shared/src)
+
+include_directories (
+ ../external/bson
+ ../external/crypto
+ ../external/cutest
+ ../external/critbit
+ ../external/iniparser
+ ../external/pdcurses
+ ../shared/src
+)
 
 set (LIB_SRCS
- ../external/md5.c
  ../external/bson/bson.c
  ../external/bson/numbers.c
- ../external/dlmalloc/malloc.c
+ ../external/critbit/critbit.c
+ ../external/crypto/md5.c
+ ../external/crypto/mt19937ar.c
  ../external/cutest/CuTest.c
+ ../external/dlmalloc/malloc.c
+ ../external/iniparser/iniparser.c
  ../shared/src/build/gamecode.c
  ../shared/src/build/kernel.c
  ../shared/src/build/lib.c
@@ -40,8 +52,9 @@ set (LINK_LIBS tolua xml2 ncurses lua5.1 pthread)
 if (NEED_SQLITE)
  set(LIB_SRCS
    ${LIB_SRCS}
-   ../external/sqlite3.c
+   ../external/sqlite3/sqlite3.c
  )
+ include_directories (../external/sqlite3)
 else (NEED_SQLITE)
  set (LINK_LIBS ${LINK_LIBS} sqlite3)
 endif (NEED_SQLITE)
diff --git a/src/main.c b/src/main.c
index be04d95d0..33d6ab58a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <gmtool.h>
 #include <kernel/config.h>
 #include <kernel/save.h>
-#include <iniparser/iniparser.h>
+#include <iniparser.h>
 
 #include <assert.h>
 #include <locale.h>