diff --git a/ChangeLog b/ChangeLog
index 1fdcec085..7fb2a031c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-15  Elijah Newren  <newren@gmail.com>
+
+	Patch from Jens Granseuer to fix more build issues with gcc 2.95.
+	#327050.
+
+	* src/boxes.c (meta_rectangle_edge_cmp_ignore_type):
+	* src/window.c (meta_window_show):
+	Remove C99 style variable initiailization
+
 2006-01-14  Elijah Newren  <newren gmail com>
 
 	* src/window.c (__window_is_terminal): Don't dereference a NULL
diff --git a/src/boxes.c b/src/boxes.c
index 0c1c3f8dd..fe99ff6b3 100644
--- a/src/boxes.c
+++ b/src/boxes.c
@@ -1226,6 +1226,7 @@ meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b)
 {
   const MetaEdge *a_edge_rect = (gconstpointer) a;
   const MetaEdge *b_edge_rect = (gconstpointer) b;
+  int a_compare, b_compare;
 
   /* Edges must be both vertical or both horizontal, or it doesn't make
    * sense to compare them.
@@ -1233,8 +1234,6 @@ meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b)
   g_assert ((a_edge_rect->rect.width  == 0 && b_edge_rect->rect.width == 0) ||
             (a_edge_rect->rect.height == 0 && b_edge_rect->rect.height == 0));
 
-  int a_compare, b_compare;
-
   a_compare = b_compare = 0;  /* gcc-3.4.2 sucks at figuring initialized'ness */
 
   if (a_edge_rect->side_type == META_DIRECTION_LEFT ||
diff --git a/src/window.c b/src/window.c
index 0dca7502d..f16df6543 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1980,8 +1980,9 @@ meta_window_show (MetaWindow *window)
            */
           if (!place_on_top_on_map && needs_stacking_adjustment)
             {
+              gboolean overlap;
               g_assert (focus_window != NULL);
-              gboolean overlap = windows_overlap (window, focus_window);
+              overlap = windows_overlap (window, focus_window);
 
               /* We want alt tab to go to the denied-focus window */
               ensure_mru_position_after (window, focus_window);