diff --git a/ChangeLog b/ChangeLog
index a32ce8ea59..a62a3b6a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-30  Sven Neumann  <sven@gimp.org>
+
+	* libgimp/gimp.c
+	* libgimpbase/gimpwire.c: cosmetic changes.
+
 2007-07-30  Sven Neumann  <sven@gimp.org>
 
 	* app/core/gimpimage.c (gimp_image_drawable_update): cosmetics.
diff --git a/libgimp/gimp.c b/libgimp/gimp.c
index 5e2ff1e2e7..41f7a26133 100644
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@@ -883,8 +883,7 @@ gimp_run_procedure (const gchar *name,
 
   va_end (args);
 
-  return_vals = gimp_run_procedure2 (name, n_return_vals,
-                                     n_params, params);
+  return_vals = gimp_run_procedure2 (name, n_return_vals, n_params, params);
 
   g_free (params);
 
diff --git a/libgimpbase/gimpwire.c b/libgimpbase/gimpwire.c
index 3afa901f3d..4f073cadce 100644
--- a/libgimpbase/gimpwire.c
+++ b/libgimpbase/gimpwire.c
@@ -382,9 +382,6 @@ _gimp_wire_read_double (GIOChannel *channel,
   gdouble *t;
   guint8   tmp[8];
   gint     i;
-#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
-  gint     j;
-#endif
 
   g_return_val_if_fail (count >= 0, FALSE);
 
@@ -392,6 +389,10 @@ _gimp_wire_read_double (GIOChannel *channel,
 
   for (i = 0; i < count; i++)
     {
+#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+      gint j;
+#endif
+
       if (! _gimp_wire_read_int8 (channel, tmp, 8, user_data))
         return FALSE;
 
@@ -418,13 +419,14 @@ _gimp_wire_read_string (GIOChannel  *channel,
                         gint         count,
                         gpointer     user_data)
 {
-  guint32 tmp;
-  gint    i;
+  gint i;
 
   g_return_val_if_fail (count >= 0, FALSE);
 
   for (i = 0; i < count; i++)
     {
+      guint32 tmp;
+
       if (! _gimp_wire_read_int32 (channel, &tmp, 1, user_data))
         return FALSE;
 
@@ -465,16 +467,16 @@ _gimp_wire_write_int32 (GIOChannel    *channel,
                         gint           count,
                         gpointer       user_data)
 {
-  guint32 tmp;
-  gint    i;
-
   g_return_val_if_fail (count >= 0, FALSE);
 
   if (count > 0)
     {
+      gint i;
+
       for (i = 0; i < count; i++)
         {
-          tmp = g_htonl (data[i]);
+          guint32 tmp = g_htonl (data[i]);
+
           if (! _gimp_wire_write_int8 (channel,
                                        (const guint8 *) &tmp, 4, user_data))
             return FALSE;
@@ -490,16 +492,16 @@ _gimp_wire_write_int16 (GIOChannel    *channel,
                         gint           count,
                         gpointer       user_data)
 {
-  guint16 tmp;
-  gint    i;
-
   g_return_val_if_fail (count >= 0, FALSE);
 
   if (count > 0)
     {
+      gint i;
+
       for (i = 0; i < count; i++)
         {
-          tmp = g_htons (data[i]);
+          guint16 tmp = g_htons (data[i]);
+
           if (! _gimp_wire_write_int8 (channel,
                                        (const guint8 *) &tmp, 2, user_data))
             return FALSE;
@@ -578,13 +580,14 @@ _gimp_wire_write_string (GIOChannel  *channel,
                          gint         count,
                          gpointer     user_data)
 {
-  guint32 tmp;
-  gint    i;
+  gint i;
 
   g_return_val_if_fail (count >= 0, FALSE);
 
   for (i = 0; i < count; i++)
     {
+      guint32 tmp;
+
       if (data[i])
         tmp = strlen (data[i]) + 1;
       else