diff --git a/ChangeLog b/ChangeLog
index 1af61232..fb2f4f02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
  * src/templates.c, src/templates.h, src/utils.c, src/utils.h,
    src/callbacks.c: Cache the current function name for efficiency in
                     utils_get_current_function, other related fixes.
+ * src/geany.h, src/callbacks.c, src/prefs.c, src/dialogs.c:
+   src/main.c: Don't include keybindings.h in geany.h.
 
 
 2006-06-15  Enrico Troeger  <enrico.troeger@uvena.de>
diff --git a/src/callbacks.c b/src/callbacks.c
index 292c7322..94f11ef8 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -46,6 +46,7 @@
 #include "prefs.h"
 #include "templates.h"
 #include "treeviews.h"
+#include "keybindings.h"
 
 
 #ifdef GEANY_WIN32
diff --git a/src/dialogs.c b/src/dialogs.c
index 251b049f..e9c09e11 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -45,6 +45,7 @@
 #include "interface.h"
 #include "utils.h"
 #include "prefs.h"
+#include "keybindings.h"
 
 
 
diff --git a/src/geany.h b/src/geany.h
index c0ed7a37..e8a00889 100644
--- a/src/geany.h
+++ b/src/geany.h
@@ -40,7 +40,6 @@
 #include "tm_tagmanager.h"
 
 #include "filetypes.h"
-#include "keybindings.h"
 
 #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l)
 
diff --git a/src/main.c b/src/main.c
index 710e31f8..41149ae9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,6 +47,8 @@
 #include "encodings.h"
 #include "treeviews.h"
 #include "notebook.h"
+#include "keybindings.h"
+
 #ifdef HAVE_VTE
 # include "vte.h"
 #endif
diff --git a/src/prefs.c b/src/prefs.c
index a926cf69..78e010e1 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -34,6 +34,8 @@
 #include "sciwrappers.h"
 #include "document.h"
 #include "keyfile.h"
+#include "keybindings.h"
+
 #ifdef HAVE_VTE
 # include "vte.h"
 #endif