diff --git a/core/src/bindings/bind_gmtool.c b/core/src/bindings/bind_gmtool.c
index 7e06a2ddc..bb0e89d14 100644
--- a/core/src/bindings/bind_gmtool.c
+++ b/core/src/bindings/bind_gmtool.c
@@ -1,10 +1,7 @@
+#include <curses.h>
 #include <platform.h>
 #include <kernel/types.h>
 
-#undef bool
-#include <curses.h>
-#include <util/bool.h>
-
 #include "bind_gmtool.h"
 #include "../gmtool.h"
 #include "../gmtool_structs.h"
diff --git a/core/src/gmtool.c b/core/src/gmtool.c
index 3dc89fa75..cc9ba43f5 100644
--- a/core/src/gmtool.c
+++ b/core/src/gmtool.c
@@ -8,10 +8,8 @@
  *
  */
 
-/* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */
-#include <platform.h>
-#undef bool
 #include <curses.h>
+#include <platform.h>
 #include <util/bool.h>
 
 #include <kernel/config.h>
diff --git a/core/src/util/listbox.c b/core/src/util/listbox.c
index 7f056bfc2..48e393baa 100644
--- a/core/src/util/listbox.c
+++ b/core/src/util/listbox.c
@@ -9,13 +9,10 @@
 */
 
 /* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */
+#include <curses.h>
 #include <platform.h>
 #include <kernel/config.h>
 
-#undef bool
-#include <curses.h>
-#include <util/bool.h>
-
 #include "listbox.h"
 #include "gmtool_structs.h"