how to resolve namespace issues between imagemagick and gif libraries?

I've made a patch that makes it possible to load an image file using
the imagemagick library. However, I cant compile in imagemagick and gif
support at the same time due to namespace collisions.

When compiling image.c:

gcc -c -D_BSD_SOURCE   -Demacs -DHAVE_CONFIG_H  -I. 
-I/mnt/data/build/emacsnew/emacs/src -D_BSD_SOURCE -I/usr/include/gtk-2.0 
-I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo 
-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
-I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 
-I/usr/include/freetype2 -I/usr/include/alsa -I/usr/include/librsvg-2 
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 
-I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 
-I/usr/include/libpng12 -fopenmp -I/usr/include/ImageMagick 
-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -Wno-pointer-sign   
image.c
In file included from /usr/include/ImageMagick/wand/deprecate.h:28,
                 from /usr/include/ImageMagick/wand/MagickWand.h:154,
                 from image.c:7865:
/usr/include/ImageMagick/wand/drawing-wand.h:172: error: conflicting types for 
âDrawRectangleâ
/usr/include/gif_lib.h:324: note: previous declaration of âDrawRectangleâ was 
here
make[1]: *** [image.o] Error 1
make[1]: Leaving directory `/mnt/data/build/emacsnew/emacs/src'
make: *** [src] Error 2

If I leave out gif support it compiles and works well enough to load a
djvu file in emacs like this:

(insert-image (create-image "/tmp/tst.djvu" 'imagemagick) )

Any hints how to fix this in a manner acceptable for Emacs code?

-- 
Joakim Verona