Index: io-ani-animation.c
===================================================================
--- io-ani-animation.c	(revisjon 19731)
+++ io-ani-animation.c	(arbeidskopi)
@@ -290,7 +290,7 @@
         return iter->current_frame != old;
 }
 
-int
+static int
 gdk_pixbuf_ani_anim_iter_get_delay_time (GdkPixbufAnimationIter *anim_iter)
 {
         GdkPixbufAniAnimIter *iter;
@@ -300,7 +300,7 @@
         return iter->ani_anim->delay[iter->current_frame] - (iter->position - iter->elapsed);
 }
 
-GdkPixbuf*
+static GdkPixbuf*
 gdk_pixbuf_ani_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter)
 {
         GdkPixbufAniAnimIter *iter;
Index: gdk-pixbuf-loader.c
===================================================================
--- gdk-pixbuf-loader.c	(revisjon 19731)
+++ gdk-pixbuf-loader.c	(arbeidskopi)
@@ -279,10 +279,10 @@
                 anim = gdk_pixbuf_non_anim_new (pixbuf);
   
 	if (priv->needs_scale) {
-		priv->animation  = _gdk_pixbuf_scaled_anim_new (anim, 	
+		priv->animation  = GDK_PIXBUF_ANIMATION (_gdk_pixbuf_scaled_anim_new (anim, 	
                                          (double) priv->width / gdk_pixbuf_get_width (pixbuf),
                                          (double) priv->height / gdk_pixbuf_get_height (pixbuf),
-					  1.0);
+					  1.0));
 			g_object_unref (anim);
 	}
 	else
Index: gdk-pixbuf-io.c
===================================================================
--- gdk-pixbuf-io.c	(revisjon 19731)
+++ gdk-pixbuf-io.c	(arbeidskopi)
@@ -300,9 +300,9 @@
 	GdkPixbufModulePattern *pattern;
 	GError *error = NULL;
 #endif
-	GdkPixbufModule *builtin_module = NULL;
 
 #define load_one_builtin_module(format)					\
+	GdkPixbufModule *builtin_module = NULL;				\
 	builtin_module = g_new0 (GdkPixbufModule, 1);			\
 	builtin_module->module_name = #format;				\
 	if (_gdk_pixbuf_load_module (builtin_module, NULL))		\
Index: io-gif-animation.c
===================================================================
--- io-gif-animation.c	(revisjon 19731)
+++ io-gif-animation.c	(arbeidskopi)
@@ -328,7 +328,7 @@
         return iter->current_frame != old;
 }
 
-int
+static int
 gdk_pixbuf_gif_anim_iter_get_delay_time (GdkPixbufAnimationIter *anim_iter)
 {
         GdkPixbufFrame *frame;
@@ -563,7 +563,7 @@
         }
 }
 
-GdkPixbuf*
+static GdkPixbuf*
 gdk_pixbuf_gif_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter)
 {
         GdkPixbufGifAnimIter *iter;
Index: io-jpeg.c
===================================================================
--- io-jpeg.c	(revisjon 19731)
+++ io-jpeg.c	(arbeidskopi)
@@ -278,10 +278,10 @@
 }
 
 
-const char leth[]  = {0x49, 0x49, 0x2a, 0x00};	// Little endian TIFF header
-const char beth[]  = {0x4d, 0x4d, 0x00, 0x2a};	// Big endian TIFF header
-const char types[] = {0x00, 0x01, 0x01, 0x02, 0x04, 0x08, 0x00, 
-		      0x08, 0x00, 0x04, 0x08}; 	// size in bytes for EXIF types
+static const char leth[]  = {0x49, 0x49, 0x2a, 0x00}; /* Little endian TIFF header */
+static const char beth[]  = {0x4d, 0x4d, 0x00, 0x2a}; /* Big endian TIFF header */
+static const char types[] = {0x00, 0x01, 0x01, 0x02, 0x04, 0x08, 0x00, 
+                             0x08, 0x00, 0x04, 0x08}; /* size in bytes for EXIF types */
  
 #define DE_ENDIAN16(val) endian == G_BIG_ENDIAN ? GUINT16_FROM_BE(val) : GUINT16_FROM_LE(val)
 #define DE_ENDIAN32(val) endian == G_BIG_ENDIAN ? GUINT32_FROM_BE(val) : GUINT32_FROM_LE(val)
@@ -1031,7 +1031,7 @@
 	GError            **error;
 } ToFunctionDestinationManager;
 
-void
+static void
 to_callback_init (j_compress_ptr cinfo)
 {
 	ToFunctionDestinationManager *destmgr;
@@ -1080,7 +1080,7 @@
 	return TRUE;
 }
 
-void
+static void
 to_callback_terminate (j_compress_ptr cinfo)
 {
 	ToFunctionDestinationManager *destmgr;
