diff --git a/ChangeLog b/ChangeLog
index a991ddc8eb..3221ab61c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-27  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/gfig/gfig-dialog.[ch]
+	* plug-ins/gfig/gfig-dobject.h
+	* plug-ins/gfig/gfig.[ch]: put extern variables where they belong.
+	Patch from Daniel Richard G. (bug #342455).
+
 2006-06-27  Sven Neumann  <sven@gimp.org>
 
 	Based on a patch from Zbigniew Chyla:
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 28cb592502..ca32a98b0c 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -85,6 +85,10 @@
 #define OBJ_SELECT_LT 2
 #define OBJ_SELECT_EQ 4
 
+/* Globals */
+gint   undo_level;  /* Last slot filled in -1 = no undo */
+GList *undo_table[MAX_UNDO];
+
 /* Values when first invoked */
 SelectItVals selvals =
 {
diff --git a/plug-ins/gfig/gfig-dialog.h b/plug-ins/gfig/gfig-dialog.h
index eaed56bfad..d75298f304 100644
--- a/plug-ins/gfig/gfig-dialog.h
+++ b/plug-ins/gfig/gfig-dialog.h
@@ -26,8 +26,8 @@
 #ifndef __GFIG_DIALOG_H__
 #define __GFIG_DIALOG_H__
 
-gint   undo_level;  /* Last slot filled in -1 = no undo */
-GList *undo_table[MAX_UNDO];
+extern gint   undo_level;  /* Last slot filled in -1 = no undo */
+extern GList *undo_table[MAX_UNDO];
 
 gboolean  gfig_dialog                      (void);
 void      gfig_dialog_action_set_sensitive (const gchar *name,
diff --git a/plug-ins/gfig/gfig-dobject.h b/plug-ins/gfig/gfig-dobject.h
index 62893783d1..6e354ac286 100644
--- a/plug-ins/gfig/gfig-dobject.h
+++ b/plug-ins/gfig/gfig-dobject.h
@@ -50,7 +50,7 @@ typedef struct
   void         (*update) (GdkPoint   *pnt);
 } GfigObjectClass;
 
-GfigObjectClass dobj_class[10];
+extern GfigObjectClass dobj_class[10];
 
 /* The object itself */
 struct _GfigObject
diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c
index c094972045..8422b6aa63 100644
--- a/plug-ins/gfig/gfig.c
+++ b/plug-ins/gfig/gfig.c
@@ -91,7 +91,14 @@ static gint       load_options            (GFigObj *gfig,
                                            FILE    *fp);
 /* globals */
 
-GdkGC  *gfig_gc;
+GdkGC        *gfig_gc;
+GfigObjectClass dobj_class[10];
+GFigContext  *gfig_context;
+GtkWidget    *top_level_dlg;
+GimpDrawable *gfig_drawable;
+GList        *gfig_list;
+gdouble       org_scale_x_factor, org_scale_y_factor;
+
 
 /* Stuff for the preview bit */
 static gint  sel_x1, sel_y1, sel_x2, sel_y2;
diff --git a/plug-ins/gfig/gfig.h b/plug-ins/gfig/gfig.h
index d3ccbb38ad..df28dc1473 100644
--- a/plug-ins/gfig/gfig.h
+++ b/plug-ins/gfig/gfig.h
@@ -152,7 +152,7 @@ typedef struct
   gboolean     using_new_layer;
 } GFigContext;
 
-GFigContext *gfig_context;
+extern GFigContext *gfig_context;
 
 extern selection_option selopt;
 extern SelectItVals selvals;
@@ -231,9 +231,9 @@ void       paint_layer_fill        (gdouble x1,
 
 
 
-GtkWidget    *top_level_dlg;
-GimpDrawable *gfig_drawable;
-GList        *gfig_list;
-gdouble       org_scale_x_factor, org_scale_y_factor;
+extern GtkWidget    *top_level_dlg;
+extern GimpDrawable *gfig_drawable;
+extern GList        *gfig_list;
+extern gdouble       org_scale_x_factor, org_scale_y_factor;
 
 #endif /* __GFIG_H__ */