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-12 22:18:51.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 "util
 #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);