diff --exclude='*~' -Naur giram-0.3.5.orig/configure giram-0.3.5/configure
--- giram-0.3.5.orig/configure	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/configure	2005-08-13 12:28:02.000000000 -0300
@@ -5432,6 +5432,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -5843,7 +5844,7 @@
 fi
 
 
-CFLAGS="-g -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS"
+CFLAGS="-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS"
 
 if test -n "$DEBUGFLAG"; then
   CFLAGS="$DEBUGFLAG $CFLAGS"
diff --exclude='*~' -Naur giram-0.3.5.orig/src/camera.c giram-0.3.5/src/camera.c
--- giram-0.3.5.orig/src/camera.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/camera.c	2005-08-13 12:18:08.000000000 -0300
@@ -19,6 +19,10 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+
+#undef GTK_DISABLE_DEPRECATED
+#warning GTK_DISABLE_DEPRECATED
+
 #include <math.h>
 #include "giram.h"
 #include "utils.h"
diff --exclude='*~' -Naur giram-0.3.5.orig/src/filetypes/povray/LoadPov.c giram-0.3.5/src/filetypes/povray/LoadPov.c
--- giram-0.3.5.orig/src/filetypes/povray/LoadPov.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/filetypes/povray/LoadPov.c	2005-08-13 12:21:00.000000000 -0300
@@ -1152,6 +1152,7 @@
         break;
       default:
        /* panic!!! */
+	;
     }
     get_token();
   }
@@ -3238,6 +3239,7 @@
 
           default:
             /*Error("Mis-matched '#case' or '#range'.");*/
+	    ;
         }
         done = TRUE;
         break;
@@ -3303,6 +3305,7 @@
 
           default:
 /*            Error("Mis-matched '#end'.");*/
+	    ;
         }
         done = TRUE;
         break;
@@ -4965,6 +4968,7 @@
         break;
       default:
         /* panic!!! */
+	;
     }
     get_token();
   }
@@ -5111,6 +5115,7 @@
       PARSE_FLOAT(HoleRadius)
       break;
     default: /* nothing */
+      ;
   }
 
   *pDisc = giram_disc_new(Center, Normal, Radius, HoleRadius);
diff --exclude='*~' -Naur giram-0.3.5.orig/src/filetypes/povray/SavePov.c giram-0.3.5/src/filetypes/povray/SavePov.c
--- giram-0.3.5.orig/src/filetypes/povray/SavePov.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/filetypes/povray/SavePov.c	2005-08-13 12:21:30.000000000 -0300
@@ -799,6 +799,7 @@
 
     default:
       /* panic */
+      ;
   }
   fprintf(OutFile, "  location <%g, %g, %g>\n", Camera->Location[0],
                                                 Camera->Location[1],
diff --exclude='*~' -Naur giram-0.3.5.orig/src/giram.c giram-0.3.5/src/giram.c
--- giram-0.3.5.orig/src/giram.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/giram.c	2005-08-12 22:13:56.000000000 -0300
@@ -25,6 +25,8 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#undef GTK_DISABLE_DEPRECATED
+#warning GTK_DISABLE_DEPRECATED
 
 #ifndef  WAIT_ANY
 #define  WAIT_ANY (-1)
diff --exclude='*~' -Naur giram-0.3.5.orig/src/giramobjecteditor.c giram-0.3.5/src/giramobjecteditor.c
--- giram-0.3.5.orig/src/giramobjecteditor.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/giramobjecteditor.c	2005-08-12 22:15:37.000000000 -0300
@@ -19,10 +19,10 @@
  */
 
 #include <stdlib.h>
+#include "widgets/gtkcolorbutton.h"
 #include "giram.h"
 
 #include "giramintl.h"
-#include "widgets/gtkcolorbutton.h"
 #include "widgets/giramfileselection.h"
 
 #include "widgets/giramvectorframe.h"
diff --exclude='*~' -Naur giram-0.3.5.orig/src/texture.c giram-0.3.5/src/texture.c
--- giram-0.3.5.orig/src/texture.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/texture.c	2005-08-13 12:38:18.000000000 -0300
@@ -21,10 +21,10 @@
 #include <string.h>
 #undef GTK_DISABLE_DEPRECATED
 #warning GTK_DISABLE_DEPRECATED
-#include "giram.h"
-#include "utils.h"
 #include "widgets/gtkcolorbutton.h"
 #include "widgets/gtkcolormapbutton.h"
+#include "giram.h"
+#include "utils.h"
 #include "texture.h"
 
 #include "widgets/giramwidgets.h"
diff --exclude='*~' -Naur giram-0.3.5.orig/src/view.c giram-0.3.5/src/view.c
--- giram-0.3.5.orig/src/view.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/view.c	2005-08-12 22:19:46.000000000 -0300
@@ -22,8 +22,11 @@
 #include <unistd.h>
 #include <math.h>
 #include <string.h>
-#include "giram.h"
+#undef GTK_DISABLE_DEPRECATED
+#warning GTK_DISABLE_DEPRECATED
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtkitemfactory.h>
+#include "giram.h"
 
 #include "tools/tools.h"
 #include "tools/tool_select.h"
diff --exclude='*~' -Naur giram-0.3.5.orig/src/widgets/gtkcolorbutton.c giram-0.3.5/src/widgets/gtkcolorbutton.c
--- giram-0.3.5.orig/src/widgets/gtkcolorbutton.c	2005-08-12 22:07:08.000000000 -0300
+++ giram-0.3.5/src/widgets/gtkcolorbutton.c	2005-08-12 22:10:41.000000000 -0300
@@ -25,11 +25,11 @@
 #undef GTK_DISABLE_DEPRECATED
 #warning GTK_DISABLE_DEPRECATED
 
+#include "gtkcolorbutton.h"
 #include "giram.h"
 
 #include "giramintl.h"
 
-#include "gtkcolorbutton.h"
 
 static void  gtk_color_button_destroy(GtkObject *object);
 static void  gtk_color_button_clicked(GtkButton *button);