diff --git a/ChangeLog b/ChangeLog
index 0e6cc44a37..b883a119d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-01  Manish Singh  <yosh@gimp.org>
+
+	* modules/Makefile.am: use AM_CPPFLAGS instead of CPPFLAGS
+
+	* modules/cdisplay_gamma.c
+	* modules/cdisplay_highcontrast.c: changed deprecated calls
+
+	* modules/colorsel_triangle.c: #undef GTK_DISABLE_DEPRECATED,
+	still needs to be fixed for use of GtkPreview
+
 2002-09-01  Michael Natterer  <mitch@gimp.org>
 
 	* app/gui/file-commands.[ch]: oops, the callback's name has
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 49cba71b19..6c4289ef6e 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -2,7 +2,7 @@
 
 libdir = $(gimpplugindir)/modules
 
-CPPFLAGS = -DMODULE_COMPILATION
+AM_CPPFLAGS = -DMODULE_COMPILATION
 
 INCLUDES = \
         -I$(top_srcdir)		\
diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c
index 6a1bec32bd..ae6b253c39 100644
--- a/modules/cdisplay_gamma.c
+++ b/modules/cdisplay_gamma.c
@@ -277,7 +277,7 @@ gamma_configure_ok_callback (GtkWidget *widget,
   GammaContext *context = data;
 
   context->gamma =
-    gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (context->spinner));
+    gtk_spin_button_get_value (GTK_SPIN_BUTTON (context->spinner));
   gamma_create_lookup_table (context);
 
 #if 0
@@ -357,7 +357,7 @@ gamma_configure (gpointer cd_ID,
       adjustment = gtk_adjustment_new (context->gamma, 0.01, 10.0, 0.01, 0.1, 0.0);
       context->spinner = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment),
 					      0.1, 3);
-      gtk_widget_set_usize (context->spinner, 100, 0);
+      gtk_widget_set_size_request (context->spinner, 100, -1);
       gtk_box_pack_start (GTK_BOX (hbox), context->spinner, FALSE, FALSE, 0);
     }
 
diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c
index d59e948ae2..1394aa688a 100644
--- a/modules/cdisplay_highcontrast.c
+++ b/modules/cdisplay_highcontrast.c
@@ -271,7 +271,8 @@ contrast_configure_ok_callback (GtkWidget *widget,
 {
   ContrastContext *context = data;
 
-  context->contrast = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (context->spinner));
+  context->contrast =
+    gtk_spin_button_get_value (GTK_SPIN_BUTTON (context->spinner));
   contrast_create_lookup_table (context);
 
 #if 0
@@ -349,7 +350,7 @@ contrast_configure (gpointer cd_ID,
       adjustment = gtk_adjustment_new (context->contrast, 1.0, 20.0, 0.5, 1.0, 0.0);
       context->spinner = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment),
 					      0.1, 3);
-      gtk_widget_set_usize (context->spinner, 100, 0);
+      gtk_widget_set_size_request (context->spinner, 100, -1);
       gtk_box_pack_start (GTK_BOX (hbox), context->spinner, FALSE, FALSE, 0); 
     }
 
diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c
index 4379e62fac..7c8e920959 100644
--- a/modules/colorsel_triangle.c
+++ b/modules/colorsel_triangle.c
@@ -24,6 +24,11 @@
 
 #include <stdlib.h>
 
+#ifdef __GNUC__
+#warning GTK_DISABLE_DEPRECATED
+#endif
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>