diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 01d50516..9d4b6e20 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -941,7 +941,10 @@ setup_spin_cb (GtkSpinButton *spin, const setting *set)
 static GtkWidget *
 setup_create_spin (GtkWidget *table, int row, const setting *set)
 {
-        GtkWidget *label, *wid, *rbox, *align;
+        GtkWidget *label, *wid, *rbox;
+#if !HAVE_GTK3
+        GtkWidget *align;
+#endif
         char *text;
 
         label = gtk_label_new (_(set->label));
@@ -1700,8 +1703,8 @@ setup_color_button_apply (GtkWidget *button, const PaletteColor *color)
 		GTK_STATE_SELECTED,
 		GTK_STATE_INSENSITIVE
 	};
-#endif
 	guint i;
+#endif
 
 #if HAVE_GTK3
 	gtkutil_apply_palette (apply_widget, color, NULL, NULL);
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
index ed570733..74a1ff8e 100644
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -51,6 +51,14 @@
 #include "xtext.h"
 #include "gtkutil.h"
 
+#ifndef HAVE_GTK3
+#if GTK_MAJOR_VERSION >= 3
+#define HAVE_GTK3 1
+#else
+#define HAVE_GTK3 0
+#endif
+#endif
+
 #if HAVE_GTK3
 #define ICON_ADD "list-add"
 #define ICON_REMOVE "list-remove"