diff --git a/src/common/hexchat-plugin.h b/src/common/hexchat-plugin.h
index cb2eff30..a127cfff 100644
--- a/src/common/hexchat-plugin.h
+++ b/src/common/hexchat-plugin.h
@@ -171,16 +171,12 @@ struct _hexchat_plugin
 	     int flags);
 	void (*hexchat_free) (hexchat_plugin *ph,
 	    void *ptr);
-	void (*hexchat_free_array) (hexchat_plugin *ph,
-	    char **arr);
 	int (*hexchat_pluginpref_set_str) (hexchat_plugin *ph,
 		const char *var,
 		const char *value);
 	int (*hexchat_pluginpref_get_str) (hexchat_plugin *ph,
 		const char *var,
 		char *dest);
-	char *(*hexchat_pluginpref_get_str_ptr) (hexchat_plugin *ph,
-		const char *var);
 	int (*hexchat_pluginpref_set_int) (hexchat_plugin *ph,
 		const char *var,
 		int value);
@@ -190,7 +186,6 @@ struct _hexchat_plugin
 		const char *var);
 	int (*hexchat_pluginpref_list) (hexchat_plugin *ph,
 		char *dest);
-	char **(*hexchat_pluginpref_list_keys) (hexchat_plugin *ph);
 	hexchat_hook *(*hexchat_hook_server_attrs) (hexchat_plugin *ph,
 		   const char *name,
 		   int pri,
@@ -208,6 +203,11 @@ struct _hexchat_plugin
 	hexchat_event_attrs *(*hexchat_event_attrs_create) (hexchat_plugin *ph);
 	void (*hexchat_event_attrs_free) (hexchat_plugin *ph,
 									  hexchat_event_attrs *attrs);
+	char *(*hexchat_pluginpref_get_str_ptr) (hexchat_plugin *ph,
+		const char *var);
+	char **(*hexchat_pluginpref_list_keys) (hexchat_plugin *ph);
+	void (*hexchat_free_array) (hexchat_plugin *ph,
+	    char **arr);
 };
 #endif
 
diff --git a/src/common/plugin.h b/src/common/plugin.h
index 610cfb63..85885b21 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -117,16 +117,12 @@ struct _hexchat_plugin
 	     int flags);
 	void (*hexchat_free) (hexchat_plugin *ph,
 	    void *ptr);
-	void (*hexchat_free_array) (hexchat_plugin *ph,
-	    char **arr);
 	int (*hexchat_pluginpref_set_str) (hexchat_plugin *ph,
 		const char *var,
 		const char *value);
 	int (*hexchat_pluginpref_get_str) (hexchat_plugin *ph,
 		const char *var,
 		char *dest);
-	char *(*hexchat_pluginpref_get_str_ptr) (hexchat_plugin *ph,
-		const char *var);
 	int (*hexchat_pluginpref_set_int) (hexchat_plugin *ph,
 		const char *var,
 		int value);
@@ -136,7 +132,6 @@ struct _hexchat_plugin
 		const char *var);
 	int (*hexchat_pluginpref_list) (hexchat_plugin *ph,
 		char *dest);
-	char **(*hexchat_pluginpref_list_keys) (hexchat_plugin *ph);
 	hexchat_hook *(*hexchat_hook_server_attrs) (hexchat_plugin *ph,
 		   const char *name,
 		   int pri,
@@ -154,6 +149,11 @@ struct _hexchat_plugin
 	hexchat_event_attrs *(*hexchat_event_attrs_create) (hexchat_plugin *ph);
 	void (*hexchat_event_attrs_free) (hexchat_plugin *ph,
 									  hexchat_event_attrs *attrs);
+	char *(*hexchat_pluginpref_get_str_ptr) (hexchat_plugin *ph,
+		const char *var);
+	char **(*hexchat_pluginpref_list_keys) (hexchat_plugin *ph);
+	void (*hexchat_free_array) (hexchat_plugin *ph,
+	    char **arr);
 
 	/* PRIVATE FIELDS! */
 	void *handle;		/* from dlopen */