diff --git a/moo/mooedit/mooedit.c b/moo/mooedit/mooedit.c
index 503a2ee5..70e59a57 100644
--- a/moo/mooedit/mooedit.c
+++ b/moo/mooedit/mooedit.c
@@ -1050,7 +1050,7 @@ moo_edit_apply_lang_config (MooEdit *edit)
 static void
 moo_edit_apply_config (MooEdit *edit)
 {
-    GtkWrapMode wrap_mode;
+    int wrap_mode;
     gboolean line_numbers;
     guint tab_width;
     char *word_chars;
diff --git a/moo/mooedit/mooeditwindow.c b/moo/mooedit/mooeditwindow.c
index 07a66ae7..396f4d25 100644
--- a/moo/mooedit/mooeditwindow.c
+++ b/moo/mooedit/mooeditwindow.c
@@ -1776,7 +1776,7 @@ wrap_text_toggled (MooEditWindow *window,
                    gboolean       active)
 {
     MooEdit *doc;
-    GtkWrapMode mode;
+    int mode;
 
     doc = ACTIVE_DOC (window);
     g_return_if_fail (doc != NULL);
@@ -2073,7 +2073,7 @@ edit_wrap_mode_changed (MooEditWindow *window,
                         MooEdit       *doc)
 {
     gpointer action;
-    GtkWrapMode mode;
+    int mode;
 
     if (doc != ACTIVE_DOC (window))
         return;
diff --git a/moo/mooedit/mootextprint.c b/moo/mooedit/mootextprint.c
index 0553fdc2..e26bb3e8 100644
--- a/moo/mooedit/mootextprint.c
+++ b/moo/mooedit/mootextprint.c
@@ -1093,7 +1093,7 @@ get_iter_attrs (MooPrintOperation *op,
 
         if (style_set)
         {
-            PangoStyle style_value;
+            int style_value;
             if (style) pango_attribute_destroy (style);
             g_object_get (tag, "style", &style_value, NULL);
             style = pango_attr_style_new (style_value);
@@ -1101,7 +1101,7 @@ get_iter_attrs (MooPrintOperation *op,
 
         if (ul_set)
         {
-            PangoUnderline underline;
+            int underline;
             if (ul) pango_attribute_destroy (ul);
             g_object_get (tag, "underline", &underline, NULL);
             ul = pango_attr_underline_new (underline);
@@ -1109,7 +1109,7 @@ get_iter_attrs (MooPrintOperation *op,
 
         if (weight_set)
         {
-            PangoWeight weight_value;
+            int weight_value;
             if (weight) pango_attribute_destroy (weight);
             g_object_get (tag, "weight", &weight_value, NULL);
             weight = pango_attr_weight_new (weight_value);
diff --git a/moo/mooutils/moobigpaned.c b/moo/mooutils/moobigpaned.c
index 9c7c062e..d6175aa6 100644
--- a/moo/mooutils/moobigpaned.c
+++ b/moo/mooutils/moobigpaned.c
@@ -367,7 +367,7 @@ child_set_pane_size (GtkWidget   *child,
                      int          size,
                      MooBigPaned *paned)
 {
-    MooPanePosition pos;
+    int pos;
 
     g_object_get (child, "pane-position", &pos, NULL);
     g_return_if_fail (paned->paned[pos] == child);
@@ -381,7 +381,7 @@ sticky_pane_notify (GtkWidget   *child,
                     G_GNUC_UNUSED GParamSpec *pspec,
                     MooBigPaned *paned)
 {
-    MooPanePosition pos;
+    int pos;
     gboolean sticky;
 
     g_object_get (child, "pane-position", &pos,
@@ -400,7 +400,7 @@ active_pane_notify (GtkWidget   *child,
                     G_GNUC_UNUSED GParamSpec *pspec,
                     MooBigPaned *paned)
 {
-    MooPanePosition pos;
+    int pos;
     MooPane *pane = NULL;
     const char *id = NULL;
     MooPanedConfig *pc;
@@ -680,7 +680,7 @@ moo_big_paned_reorder_pane (MooBigPaned    *paned,
 {
     MooPane *pane;
     MooPaned *child;
-    MooPanePosition old_position;
+    int old_position;
     int old_index;
     const char *id;
 
@@ -919,7 +919,7 @@ moo_big_paned_get_property (GObject    *object,
                             GParamSpec *pspec)
 {
     MooBigPaned *paned = MOO_BIG_PANED (object);
-    GdkCursorType cursor_type;
+    int cursor_type;
 
     switch (prop_id)
     {
@@ -1329,7 +1329,7 @@ get_drop_area (MooBigPaned    *paned,
                GdkRectangle   *button_rect)
 {
     int width, height, size = 0;
-    MooPanePosition active_position;
+    int active_position;
 
     width = paned->priv->outer->allocation.width;
     height = paned->priv->outer->allocation.height;
diff --git a/moo/mooutils/moowindow.c b/moo/mooutils/moowindow.c
index 85076d07..80893451 100644
--- a/moo/mooutils/moowindow.c
+++ b/moo/mooutils/moowindow.c
@@ -941,7 +941,7 @@ static GtkToolbarStyle
 get_toolbar_style_gtk (MooWindow *window)
 {
     GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (window));
-    GtkToolbarStyle style = GTK_TOOLBAR_ICONS;
+    int style = GTK_TOOLBAR_ICONS;
     gpointer toolbar_class;
 
     g_return_val_if_fail (settings != NULL, style);
@@ -950,7 +950,7 @@ get_toolbar_style_gtk (MooWindow *window)
     g_object_get (settings, "gtk-toolbar-style", &style, NULL);
     g_type_class_unref (toolbar_class);
 
-    g_return_val_if_fail (style < N_STYLES, 0);
+    g_return_val_if_fail (0 <= style && style < N_STYLES, 0);
     return style;
 }