diff -Naur easytag-0.30.2.orig/src/browser.c easytag-0.30.2/src/browser.c
--- easytag-0.30.2.orig/src/browser.c	2004-05-14 15:43:47 -0400
+++ easytag-0.30.2/src/browser.c	2004-05-14 15:44:33 -0400
@@ -1852,6 +1852,8 @@
  */
 void Browser_Tree_Rebuild (gchar *path_to_load)
 {
+    gchar *current_path = NULL;
+
     /* May be called from GtkUIManager callback */
     if (GTK_IS_ACTION(path_to_load))
         path_to_load = NULL;
@@ -1861,7 +1863,6 @@
         Browser_Tree_Select_Dir(path_to_load);
         return;
     }
-    gchar *current_path = NULL;
 
     /* Memorize the current path to load it again at the end */
 
diff -Naur easytag-0.30.2.orig/src/id3_tag.c easytag-0.30.2/src/id3_tag.c
--- easytag-0.30.2.orig/src/id3_tag.c	2004-05-14 15:43:47 -0400
+++ easytag-0.30.2/src/id3_tag.c	2004-05-14 16:15:05 -0400
@@ -89,6 +89,11 @@
     ID3Tag *id3_tag = NULL;    /* Tag defined by the id3lib */
     gchar  *string, *string1, *string2;
     gchar *filename_real = filename_utf8;
+    ID3Frame *id3_frame;
+    ID3Field *id3_field;
+    size_t offset;
+    luint num_chars;
+    guint field_num = 0; // First field
 
     if (!filename_real || !FileTag)
         return FALSE;
@@ -109,12 +114,6 @@
         return FALSE;
     }
 
-    ID3Frame *id3_frame;
-    ID3Field *id3_field;
-    size_t offset;
-    luint num_chars;
-    guint field_num = 0; // First field
-
     /* Link the file to the tag */
     offset = ID3Tag_Link_1(id3_tag,filename_real);
     if ( offset && CONVERT_OLD_ID3V2_TAG_VERSION )
@@ -432,6 +431,10 @@
     gboolean has_genre    = 1;
     gboolean has_comment  = 1;
     gboolean has_song_len = 1;
+    
+    ID3Frame *id3_frame;
+    ID3Field *id3_field;
+    gchar *string, *string1;
 
     if (!ETFile || !ETFile->FileTag)
         return FALSE;
@@ -462,10 +465,6 @@
     basename_utf8 = basename_real;
     TRANSLATE_FILENAME(basename_utf8, temp, FALSE);
 
-    ID3Frame *id3_frame;
-    ID3Field *id3_field;
-    gchar *string, *string1;
-
     ID3Tag_Link(id3_tag,filename_real);
 
     /*********