diff --git a/gsk/gskroundedrect.c b/gsk/gskroundedrect.c
index 81a5b96e61..42df2bf06c 100644
--- a/gsk/gskroundedrect.c
+++ b/gsk/gskroundedrect.c
@@ -310,7 +310,17 @@ gsk_rounded_rect_scale_affine (GskRoundedRect       *dest,
     }
 }
 
-/* XXX: Find a better name */
+/*<private>
+ * gsk_rounded_rect_is_circular:
+ * @self: the `GskRoundedRect` to check
+ *
+ * Checks if all corners of @self are quarter-circles (as
+ * opposed to quarter-ellipses).
+ *
+ * Note that different corners can still have different radii.
+ *
+ * Returns: %TRUE if the rectangle is circular.
+ */
 gboolean
 gsk_rounded_rect_is_circular (const GskRoundedRect *self)
 {
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index dcc8e75417..3f180b0f42 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -28,7 +28,6 @@
 #include "gtkversion.h"
 #include "gdkprofilerprivate.h"
 
-/* XXX: For g_memdup2() */
 #include "gtkprivate.h"
 
 #include <gio/gio.h>
diff --git a/gtk/gtkcellareaboxcontext.c b/gtk/gtkcellareaboxcontext.c
index fc50547b25..19020041b2 100644
--- a/gtk/gtkcellareaboxcontext.c
+++ b/gtk/gtkcellareaboxcontext.c
@@ -25,7 +25,6 @@
 #include "gtkcellareaboxcontextprivate.h"
 #include "gtkorientable.h"
 
-/* XXX: For g_memdup2() */
 #include "gtkprivate.h"
 
 /* GObjectClass */
diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c
index d28daf5ac2..ce96a23e0c 100644
--- a/gtk/gtkcssenumvalue.c
+++ b/gtk/gtkcssenumvalue.c
@@ -268,7 +268,7 @@ gtk_css_value_font_size_compute (GtkCssValue      *value,
         font_size = _gtk_css_number_value_get (parent_style->core->font_size, 100);
       else
         font_size = gtk_css_font_size_get_default_px (provider, style);
-      /* XXX: This is what WebKit does... */
+      /* This is what WebKit does... */
       font_size /= 1.2;
       break;
     case GTK_CSS_FONT_SIZE_LARGER:
@@ -276,7 +276,7 @@ gtk_css_value_font_size_compute (GtkCssValue      *value,
         font_size = _gtk_css_number_value_get (parent_style->core->font_size, 100);
       else
         font_size = gtk_css_font_size_get_default_px (provider, style);
-      /* XXX: This is what WebKit does... */
+      /* This is what WebKit does... */
       font_size *= 1.2;
       break;
   }
diff --git a/gtk/gtkcsskeyframes.c b/gtk/gtkcsskeyframes.c
index f66178cae4..33d71ef067 100644
--- a/gtk/gtkcsskeyframes.c
+++ b/gtk/gtkcsskeyframes.c
@@ -24,7 +24,6 @@
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkstylepropertyprivate.h"
 
-/* XXX: For g_memdup2() */
 #include "gtkprivate.h"
 
 #include <stdlib.h>
@@ -97,7 +96,8 @@ gtk_css_keyframes_add_keyframe (GtkCssKeyframes *keyframes,
               KEYFRAMES_VALUE (keyframes, k, p) = NULL;
 
               /* XXX: GC properties that are now unset
-               * in all keyframes? */
+               * in all keyframes?
+               */
             }
           return k;
         }
diff --git a/gtk/gtkcssnodedeclaration.c b/gtk/gtkcssnodedeclaration.c
index 73d002a3fa..f170efc02b 100644
--- a/gtk/gtkcssnodedeclaration.c
+++ b/gtk/gtkcssnodedeclaration.c
@@ -19,7 +19,6 @@
 
 #include "gtkcssnodedeclarationprivate.h"
 
-/* XXX: For g_memdup2() */
 #include "gtkprivate.h"
 
 #include <string.h>
diff --git a/gtk/gtkexpression.c b/gtk/gtkexpression.c
index 9e082ef008..8ff380a64f 100644
--- a/gtk/gtkexpression.c
+++ b/gtk/gtkexpression.c
@@ -22,7 +22,6 @@
 
 #include "gtkexpression.h"
 
-/* XXX: For g_memdup2() */
 #include "gtkprivate.h"
 
 #include <gobject/gvaluecollector.h>
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index c0b33c6761..208c36d715 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2269,7 +2269,7 @@ real_choose_icon (GtkIconTheme      *self,
     {
       GTK_NOTE(ICONFALLBACK, {
         char *s = g_strjoinv (", ", (char **)icon_names);
-        g_message ("No icon found for: %s", s);
+        g_message ("No icon found in %s (or fallbacks) for: %s", self->current_theme, s);
         g_free (s);
       });
       icon = icon_paintable_new ("image-missing", size, scale);
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 0c9a1add77..ac4589f12a 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2002,7 +2002,7 @@ gtk_icon_view_set_cursor (GtkIconView     *icon_view,
       _gtk_icon_view_set_cell_data (icon_view, item);
       gtk_cell_area_activate (icon_view->priv->cell_area, context, 
 			      GTK_WIDGET (icon_view), &item->cell_area, 
-			      0 /* XXX flags */, TRUE);
+			      0, TRUE);
     }
 }
 
@@ -2156,7 +2156,7 @@ gtk_icon_view_button_press (GtkGestureClick *gesture,
 	      _gtk_icon_view_set_cell_data (icon_view, item);
 	      gtk_cell_area_activate (icon_view->priv->cell_area, context,
 				      GTK_WIDGET (icon_view),
-				      &item->cell_area, 0/* XXX flags */, FALSE);
+				      &item->cell_area, 0, FALSE);
 	    }
 	}
       else
@@ -2489,7 +2489,7 @@ gtk_icon_view_real_activate_cursor_item (GtkIconView *icon_view)
   gtk_cell_area_activate (icon_view->priv->cell_area, context,
                           GTK_WIDGET (icon_view),
                           &icon_view->priv->cursor_item->cell_area,
-                          0 /* XXX flags */,
+                          0,
                           FALSE);
 
   path = gtk_tree_path_new_from_indices (icon_view->priv->cursor_item->index, -1);
diff --git a/gtk/gtkroundedbox.c b/gtk/gtkroundedbox.c
index 74f3eb8655..44f8f8312c 100644
--- a/gtk/gtkroundedbox.c
+++ b/gtk/gtkroundedbox.c
@@ -23,7 +23,6 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsstypesprivate.h"
 
-/* XXX: For g_memdup2() */
 #include "gtkprivate.h"
 
 #include <string.h>