diff --git a/modules/color-selector-cmyk-lcms.c b/modules/color-selector-cmyk-lcms.c
index 426fea891f..20eb3f9722 100644
--- a/modules/color-selector-cmyk-lcms.c
+++ b/modules/color-selector-cmyk-lcms.c
@@ -34,7 +34,7 @@
 
 /* definitions and variables */
 
-#define COLORSEL_TYPE_CMYK            (colorsel_cmyk_type)
+#define COLORSEL_TYPE_CMYK            (colorsel_cmyk_get_type ())
 #define COLORSEL_CMYK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), COLORSEL_TYPE_CMYK, ColorselCmyk))
 #define COLORSEL_CMYK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), COLORSEL_TYPE_CMYK, ColorselCmykClass))
 #define COLORSEL_IS_CMYK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COLORSEL_TYPE_CMYK))
@@ -65,9 +65,8 @@ struct _ColorselCmykClass
 };
 
 
-static GType  colorsel_cmyk_get_type       (GTypeModule       *module);
-static void   colorsel_cmyk_class_init     (ColorselCmykClass *klass);
-static void   colorsel_cmyk_init           (ColorselCmyk      *cmyk);
+static GType  colorsel_cmyk_get_type       (void);
+
 static void   colorsel_cmyk_dispose        (GObject           *object);
 
 static void   colorsel_cmyk_set_color      (GimpColorSelector *selector,
@@ -91,8 +90,9 @@ static const GimpModuleInfo colorsel_cmyk_info =
   "September 2006"
 };
 
-static GType         colorsel_cmyk_type = 0;
-static GObjectClass *parent_class       = NULL;
+
+G_DEFINE_DYNAMIC_TYPE (ColorselCmyk, colorsel_cmyk,
+                       GIMP_TYPE_COLOR_SELECTOR)
 
 
 G_MODULE_EXPORT const GimpModuleInfo *
@@ -104,47 +104,17 @@ gimp_module_query (GTypeModule *module)
 G_MODULE_EXPORT gboolean
 gimp_module_register (GTypeModule *module)
 {
-  colorsel_cmyk_get_type (module);
+  colorsel_cmyk_register_type (module);
 
   return TRUE;
 }
 
-static GType
-colorsel_cmyk_get_type (GTypeModule *module)
-{
-  if (! colorsel_cmyk_type)
-    {
-      const GTypeInfo select_info =
-      {
-        sizeof (ColorselCmykClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) colorsel_cmyk_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data     */
-        sizeof (ColorselCmyk),
-        0,              /* n_preallocs    */
-        (GInstanceInitFunc) colorsel_cmyk_init,
-      };
-
-      colorsel_cmyk_type =
-        g_type_module_register_type (module,
-                                     GIMP_TYPE_COLOR_SELECTOR,
-                                     "ColorselCmyk",
-                                     &select_info, 0);
-    }
-
-  return colorsel_cmyk_type;
-}
-
 static void
 colorsel_cmyk_class_init (ColorselCmykClass *klass)
 {
   GObjectClass           *object_class   = G_OBJECT_CLASS (klass);
   GimpColorSelectorClass *selector_class = GIMP_COLOR_SELECTOR_CLASS (klass);
 
-  parent_class = g_type_class_peek_parent (klass);
-
   object_class->dispose      = colorsel_cmyk_dispose;
 
   selector_class->name       = _("CMYK");
@@ -154,6 +124,11 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass)
   selector_class->set_config = colorsel_cmyk_set_config;
 }
 
+static void
+colorsel_cmyk_class_finalize (ColorselCmykClass *klass)
+{
+}
+
 static void
 colorsel_cmyk_init (ColorselCmyk *module)
 {
@@ -234,7 +209,7 @@ colorsel_cmyk_dispose (GObject *object)
 
   colorsel_cmyk_set_config (GIMP_COLOR_SELECTOR (object), NULL);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (colorsel_cmyk_parent_class)->dispose (object);
 }
 
 static void