diff --git a/ChangeLog b/ChangeLog
index 28901270..21382ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
    does nothing).
  * src/keybindings.c, src/keybindings.h, src/plugindata.h:
    Make keybindings_send_command() take guint parameters, not gint.
+ * src/plugindata.h:
+   Avoid including keybindings.h.
 
 
 2008-03-07  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/src/plugindata.h b/src/plugindata.h
index 8a95f1ae..5d2b1b77 100644
--- a/src/plugindata.h
+++ b/src/plugindata.h
@@ -22,12 +22,6 @@
  * $Id$
  */
 
-#ifndef PLUGIN_H
-#define PLUGIN_H
-
-#include "keybindings.h"	/* needed for KeyCallback typedef */
-
-
 /**
  *  @file plugindata.h
  *  This file defines the plugin API, the interface between Geany and its plugins.
@@ -36,6 +30,9 @@
  **/
 
 
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
 /* The API version should be incremented whenever any plugin data types below are
  * modified or appended to. */
 static const gint api_version = 48;
@@ -332,11 +329,14 @@ typedef struct EncodingFuncs
 EncodingFuncs;
 
 
+struct KeyBindingGroup;
+typedef void (*_KeyCallback) (guint key_id);
+
 typedef struct KeybindingFuncs
 {
 	void		(*send_command) (guint group_id, guint key_id);
 	void		(*set_item) (struct KeyBindingGroup *group, gsize key_id,
-					KeyCallback callback, guint key, GdkModifierType mod,
+					_KeyCallback callback, guint key, GdkModifierType mod,
 					const gchar *name, const gchar *label, GtkWidget *menu_item);
 }
 KeybindingFuncs;