diff --git a/moo.kdevelop b/moo.kdevelop
index 5b1d6498..823ac02e 100644
--- a/moo.kdevelop
+++ b/moo.kdevelop
@@ -292,16 +292,16 @@
   </kdevdoctreeview>
   <kdevfilecreate>
     <filetypes>
-      <type icon="source" ext="g" name="GAP source" create="template" >
+      <type icon="source" ext="g" create="template" name="GAP source" >
         <descr>A new empty GAP source file</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
         <descr>A new empty C++ file.</descr>
       </type>
-      <type icon="source_h" ext="h" name="C/C++ Header" create="template" >
+      <type icon="source_h" ext="h" create="template" name="C/C++ Header" >
         <descr>A new empty header file for C/C++.</descr>
       </type>
-      <type icon="source_c" ext="c" name="C Source" create="template" >
+      <type icon="source_c" ext="c" create="template" name="C Source" >
         <descr>A new empty C file.</descr>
       </type>
     </filetypes>
diff --git a/moo/mooapp/mooappabout.c b/moo/mooapp/mooappabout.c
index 68801230..36dade64 100644
--- a/moo/mooapp/mooappabout.c
+++ b/moo/mooapp/mooappabout.c
@@ -344,7 +344,7 @@ moo_app_about_dialog (GtkWidget *parent)
     if (parent)
         parent = gtk_widget_get_toplevel (parent);
 
-    if (parent && GTK_WIDGET_TOPLEVEL (parent))
+    if (parent && GTK_IS_WINDOW (parent))
         gtk_window_set_transient_for (GTK_WINDOW (about_dialog), GTK_WINDOW (parent));
 
     gtk_window_present (GTK_WINDOW (about_dialog));
diff --git a/moo/mooutils/moodialogs.c b/moo/mooutils/moodialogs.c
index 2794abb6..8ab6d789 100644
--- a/moo/mooutils/moodialogs.c
+++ b/moo/mooutils/moodialogs.c
@@ -155,7 +155,7 @@ moo_position_window_real (GtkWidget  *window,
 
     if (parent)
         toplevel = gtk_widget_get_toplevel (parent);
-    if (toplevel && !GTK_WIDGET_TOPLEVEL (toplevel))
+    if (toplevel && !GTK_IS_WINDOW (toplevel))
         toplevel = NULL;
 
     if (toplevel)
@@ -171,7 +171,7 @@ moo_position_window_real (GtkWidget  *window,
 
     if (!at_mouse && !at_coords && parent && GTK_WIDGET_REALIZED (parent))
     {
-        if (GTK_WIDGET_TOPLEVEL (parent))
+        if (GTK_IS_WINDOW (parent))
         {
             gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER_ON_PARENT);
         }
@@ -245,7 +245,7 @@ moo_message_dialog (GtkWidget  *parent,
 
     if (parent)
         toplevel = gtk_widget_get_toplevel (parent);
-    if (!toplevel || !GTK_WIDGET_TOPLEVEL (toplevel))
+    if (!toplevel || !GTK_IS_WINDOW (toplevel))
         toplevel = NULL;
 
     dialog = create_message_dialog (toplevel ? GTK_WINDOW (toplevel) : NULL,
diff --git a/moo/mooutils/moofileview/mooiconview.c b/moo/mooutils/moofileview/mooiconview.c
index ed628696..945f90cd 100644
--- a/moo/mooutils/moofileview/mooiconview.c
+++ b/moo/mooutils/moofileview/mooiconview.c
@@ -3226,7 +3226,7 @@ drag_scroll_timeout (MooIconView *view)
 
     toplevel = gtk_widget_get_toplevel (widget);
 
-    if (!GTK_WIDGET_TOPLEVEL (toplevel))
+    if (!GTK_IS_WINDOW (toplevel))
     {
         g_critical ("%s: oops", G_STRLOC);
         goto out;