Index: libgtkpod/gtkpod_app_iface.c
===================================================================
--- libgtkpod/gtkpod_app_iface.c.orig	2011-09-26 20:00:07.000000000 +0200
+++ libgtkpod/gtkpod_app_iface.c	2011-09-26 20:01:52.000000000 +0200
@@ -695,3 +695,6 @@
     GtkPodAppInterface *gp_iface = GTKPOD_APP_GET_INTERFACE (gtkpod_app);
     return g_hash_table_get_keys(gp_iface->filetypes);
 }
+
+GtkPodApp *gtkpod_app;
+guint gtkpod_app_signals[LAST_SIGNAL];
Index: libgtkpod/gtkpod_app_iface.h
===================================================================
--- libgtkpod/gtkpod_app_iface.h.orig	2011-09-26 20:00:07.000000000 +0200
+++ libgtkpod/gtkpod_app_iface.h	2011-09-26 20:01:52.000000000 +0200
@@ -80,7 +80,7 @@
 } CONF_STATE;
 
 /* predefined IDs for use with gtkpod_confirmation() */
-enum {
+typedef enum {
     CONF_ID_IPOD_DIR = 0,
     CONF_ID_GTKPOD_WARNING,
     CONF_ID_DANGLING0,
@@ -245,7 +245,7 @@
 FileType* gtkpod_get_filetype(gchar *name);
 GList *gtkpod_get_filetypes();
 
-GtkPodApp *gtkpod_app;
-guint gtkpod_app_signals[LAST_SIGNAL];
+extern GtkPodApp *gtkpod_app;
+extern guint gtkpod_app_signals[LAST_SIGNAL];
 
 #endif /* GTKPOD_APP_IFACE_H_ */
Index: plugins/core_preferences/plugin.c
===================================================================
--- plugins/core_preferences/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/core_preferences/plugin.c	2011-09-26 20:01:52.000000000 +0200
@@ -41,6 +41,8 @@
 #define PREFERENCE_ICON "core_prefs-gtkpod-category"
 #define PREFERENCE_ICON_STOCK_ID "core_prefs-preference-icon"
 
+CorePrefsPlugin *core_prefs_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 
Index: plugins/core_preferences/plugin.h
===================================================================
--- plugins/core_preferences/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/core_preferences/plugin.h	2011-09-26 20:01:52.000000000 +0200
@@ -61,6 +61,6 @@
     AnjutaPluginClass parent_class;
 };
 
-CorePrefsPlugin *core_prefs_plugin;
+extern CorePrefsPlugin *core_prefs_plugin;
 
 #endif /* PLUGIN_H_ */
Index: plugins/details_editor/plugin.c
===================================================================
--- plugins/details_editor/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/details_editor/plugin.c	2011-09-26 20:01:52.000000000 +0200
@@ -37,6 +37,8 @@
 #include "details.h"
 #include "details_editor_actions.h"
 
+DetailsEditorPlugin *details_editor_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 
Index: plugins/details_editor/plugin.h
===================================================================
--- plugins/details_editor/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/details_editor/plugin.h	2011-09-26 20:01:52.000000000 +0200
@@ -52,6 +52,6 @@
     AnjutaPluginClass parent_class;
 };
 
-DetailsEditorPlugin *details_editor_plugin;
+extern DetailsEditorPlugin *details_editor_plugin;
 
 #endif /* PLUGIN_H_ */
Index: plugins/info_display/plugin.c
===================================================================
--- plugins/info_display/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/info_display/plugin.c	2011-09-26 20:01:52.000000000 +0200
@@ -37,6 +37,8 @@
 #include "info.h"
 #include "infoview.h"
 
+InfoDisplayPlugin *info_display_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 
Index: plugins/info_display/plugin.h
===================================================================
--- plugins/info_display/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/info_display/plugin.h	2011-09-26 20:01:52.000000000 +0200
@@ -50,6 +50,6 @@
     AnjutaPluginClass parent_class;
 };
 
-InfoDisplayPlugin *info_display_plugin;
+extern InfoDisplayPlugin *info_display_plugin;
 
 #endif /* PLUGIN_H_ */
Index: plugins/photo_editor/plugin.c
===================================================================
--- plugins/photo_editor/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/photo_editor/plugin.c	2011-09-26 20:01:52.000000000 +0200
@@ -38,6 +38,8 @@
 #include "photo_editor_actions.h"
 #include "plugin.h"
 
+PhotoEditorPlugin *photo_editor_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 
Index: plugins/photo_editor/plugin.h
===================================================================
--- plugins/photo_editor/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/photo_editor/plugin.h	2011-09-26 20:01:52.000000000 +0200
@@ -59,6 +59,6 @@
     AnjutaPluginClass parent_class;
 };
 
-PhotoEditorPlugin *photo_editor_plugin;
+extern PhotoEditorPlugin *photo_editor_plugin;
 
 #endif /* PLUGIN_H_ */
Index: plugins/repository_editor/plugin.c
===================================================================
--- plugins/repository_editor/plugin.c.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/repository_editor/plugin.c	2011-09-26 20:01:52.000000000 +0200
@@ -37,6 +37,8 @@
 #include "repository.h"
 #include "repository_actions.h"
 
+RepositoryEditorPlugin *repository_editor_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 
Index: plugins/repository_editor/plugin.h
===================================================================
--- plugins/repository_editor/plugin.h.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/repository_editor/plugin.h	2011-09-26 20:01:52.000000000 +0200
@@ -51,6 +51,6 @@
     AnjutaPluginClass parent_class;
 };
 
-RepositoryEditorPlugin *repository_editor_plugin;
+extern RepositoryEditorPlugin *repository_editor_plugin;
 
 #endif /* PLUGIN_H_ */
Index: plugins/sorttab_display/display_sorttabs.c
===================================================================
--- plugins/sorttab_display/display_sorttabs.c.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/sorttab_display/display_sorttabs.c	2011-09-26 20:01:52.000000000 +0200
@@ -83,6 +83,8 @@
 
 GtkBuilder *cal_xml;
 
+GtkPaned *sorttab_parent;
+
 /* ---------------------------------------------------------------- */
 /*                                                                  */
 /* Section for filter tab display (callback)                        */
Index: plugins/sorttab_display/display_sorttabs.h
===================================================================
--- plugins/sorttab_display/display_sorttabs.h.orig	2011-09-26 20:00:07.000000000 +0200
+++ plugins/sorttab_display/display_sorttabs.h	2011-09-26 20:01:52.000000000 +0200
@@ -119,7 +119,7 @@
 #define SP_SHIFT 9
 #define SP_MASK ((1<<SP_SHIFT)-1)
 
-GtkPaned *sorttab_parent;
+extern GtkPaned *sorttab_parent;
 
 void st_create_tabs(GtkPaned *parent, gchar *glade_path);
 void st_init(ST_CAT_item new_category, guint32 inst);