diff --git a/ChangeLog b/ChangeLog
index e395d8889..3fd7ee340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-05 Patrick Winnertz <winnie@debian.org>
+
+	* reverted all mhl usage in files except escaping stuff
+
 2009-02-04 Enrico Weigelt, metux ITS <weigelt@metux.de>
 
 	* mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing #239, #240)
diff --git a/edit/usermap.c b/edit/usermap.c
index 7914d75ee..b25cad949 100644
--- a/edit/usermap.c
+++ b/edit/usermap.c
@@ -29,8 +29,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/edit/usermap.h b/edit/usermap.h
index 29097c432..bf06d12c2 100644
--- a/edit/usermap.h
+++ b/edit/usermap.h
@@ -1,7 +1,7 @@
 #ifndef MC_USERMAP_H
 #define MC_USERMAP_H
 
-#include <stdbool.h>
+#include <mhl/types.h>
 
 #define MC_USERMAP ".mc/cedit/cooledit.bindings"
 
diff --git a/src/ecs-test.c b/src/ecs-test.c
index 2493be9d7..963a63bf2 100644
--- a/src/ecs-test.c
+++ b/src/ecs-test.c
@@ -28,7 +28,8 @@
 #include <assert.h>
 #include <locale.h>
 #include <stdio.h>
-#include <stdbool.h>
+
+#include <mhl/types.h>
 
 #include "global.h"
 #include "ecs.h"
diff --git a/src/ecs.c b/src/ecs.c
index cd8da0cb1..a38c54e93 100644
--- a/src/ecs.c
+++ b/src/ecs.c
@@ -26,8 +26,8 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/string.h>
 
 #include "global.h"
diff --git a/src/ecs.h b/src/ecs.h
index 1a53c6f56..98e9a9a92 100644
--- a/src/ecs.h
+++ b/src/ecs.h
@@ -44,7 +44,7 @@ typedef char ecs_char;
 #  define ECS_STR(s)		(s)
 #endif
 
-#include <stdbool.h>
+#include <mhl/types.h>
 
 /*
  * String conversion functions between the wide character encoding and
diff --git a/src/file.c b/src/file.c
index ebd414ec3..1a367eaf1 100644
--- a/src/file.c
+++ b/src/file.c
@@ -48,8 +48,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/escape.h>
 #include <mhl/string.h>
diff --git a/src/find.c b/src/find.c
index 564ed8678..bf95b7f35 100644
--- a/src/find.c
+++ b/src/find.c
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/key.c b/src/key.c
index 3bf66de69..1434fa7dd 100644
--- a/src/key.c
+++ b/src/key.c
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/logging.c b/src/logging.c
index 60db3e671..a48dcfb79 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -25,9 +25,9 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdbool.h>
 
 #include <mhl/memory.h>
+#include <mhl/types.h>
 
 #include "global.h"
 #include "logging.h"
diff --git a/src/treestore.c b/src/treestore.c
index e8d81ec98..cb08cb2db 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -40,8 +40,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/tty.c b/src/tty.c
index 70dbfb6e3..44b40e5cb 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,7 +28,6 @@
 
 #include <signal.h>
 #include <stdarg.h>
-#include <stdbool.h>
 
 #include <mhl/types.h>
 
diff --git a/src/tty.h b/src/tty.h
index b7ea9283a..f6d520b77 100644
--- a/src/tty.h
+++ b/src/tty.h
@@ -25,7 +25,7 @@
 #endif /* WANT_TERM_H */
 #endif /* USE_NCURSES */
 
-#include <stdbool.h>
+#include <mhl/types.h>
 
 /* {{{ Input }}} */
 
diff --git a/src/utilunix.c b/src/utilunix.c
index 71f839aeb..4cf70dc13 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -41,6 +41,7 @@
 #endif
 #include <unistd.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/view.c b/src/view.c
index b00916a5f..dcd35596c 100644
--- a/src/view.c
+++ b/src/view.c
@@ -42,8 +42,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/widget.c b/src/widget.c
index e8f8be3cd..31afab692 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -33,8 +33,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/widget.h b/src/widget.h
index 772b1b7d7..d7596b18d 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,7 +1,7 @@
 #ifndef MC_WIDGET_H
 #define MC_WIDGET_H
 
-#include <stdbool.h>
+#include <mhl/types.h>
 
 #include "dialog.h"		/* Widget */
 
diff --git a/src/x11conn.c b/src/x11conn.c
index 760842a16..85059321a 100644
--- a/src/x11conn.c
+++ b/src/x11conn.c
@@ -36,7 +36,6 @@ typedef int dummy;		/* C99 forbids empty compilation unit */
 
 #include <setjmp.h>
 #include <X11/Xlib.h>
-#include <stdbool.h>
 
 #include <mhl/memory.h>
 
@@ -46,6 +45,8 @@ typedef int dummy;		/* C99 forbids empty compilation unit */
 #  include <gmodule.h>
 #endif
 
+#include <mhl/types.h>
+
 #include "x11conn.h"
 
 /*** file scope type declarations **************************************/
diff --git a/vfs/smbfs.c b/vfs/smbfs.c
index 23121ca3c..db0d94525 100644
--- a/vfs/smbfs.c
+++ b/vfs/smbfs.c
@@ -25,8 +25,8 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/string.h>
 
 #undef	USE_NCURSES	/* Don't include *curses.h */
diff --git a/vfs/utilvfs.c b/vfs/utilvfs.c
index 75acfe4c2..980141d41 100644
--- a/vfs/utilvfs.c
+++ b/vfs/utilvfs.c
@@ -21,8 +21,8 @@
 #include <config.h>
 
 #include <ctype.h>
-#include <stdbool.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/vfs/utilvfs.h b/vfs/utilvfs.h
index f4cdcf556..75316bc1a 100644
--- a/vfs/utilvfs.h
+++ b/vfs/utilvfs.h
@@ -2,7 +2,8 @@
 #define MC_VFS_UTILVFS_H
 
 #include <sys/stat.h>
-#include <stdbool.h>
+
+#include <mhl/types.h>
 
 /* Flags for vfs_split_url() */
 #define URL_ALLOW_ANON 1