More GObject boilerplate reduction

(bzr r12065)

19 files changed, 217 insertions, 728 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index 809bd6c00..a43927e81 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -31,10 +31,6 @@
 #include "display/nr-filter-types.h"
 
 /* FeBlend base class */
-
-static void sp_feBlend_class_init(SPFeBlendClass *klass);
-static void sp_feBlend_init(SPFeBlend *feBlend);
-
 static void sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feBlend_release(SPObject *object);
 static void sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value);
@@ -42,28 +38,7 @@ static void sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feBlend_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feBlend_build_renderer(SPFilterPrimitive *sp_prim, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feBlend_parent_class;
-
-GType
-sp_feBlend_get_type()
-{
-    static GType feBlend_type = 0;
-
-    if (!feBlend_type) {
-        GTypeInfo feBlend_info = {
-            sizeof(SPFeBlendClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feBlend_class_init,
-            NULL, NULL,
-            sizeof(SPFeBlend),
-            16,
-            (GInstanceInitFunc) sp_feBlend_init,
-            NULL,    /* value_table */
-        };
-        feBlend_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeBlend", &feBlend_info, (GTypeFlags)0);
-    }
-    return feBlend_type;
-}
+G_DEFINE_TYPE(SPFeBlend, sp_feBlend, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feBlend_class_init(SPFeBlendClass *klass)
@@ -71,8 +46,6 @@ sp_feBlend_class_init(SPFeBlendClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feBlend_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feBlend_build;
     sp_object_class->release = sp_feBlend_release;
     sp_object_class->write = sp_feBlend_write;
@@ -98,8 +71,8 @@ sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
 {
     SPFeBlend *blend = SP_FEBLEND(object);
 
-    if (((SPObjectClass *) feBlend_parent_class)->build) {
-        ((SPObjectClass *) feBlend_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feBlend_parent_class)->build) {
+        ((SPObjectClass *) sp_feBlend_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -123,8 +96,8 @@ sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
 static void
 sp_feBlend_release(SPObject *object)
 {
-    if (((SPObjectClass *) feBlend_parent_class)->release)
-        ((SPObjectClass *) feBlend_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feBlend_parent_class)->release)
+        ((SPObjectClass *) sp_feBlend_parent_class)->release(object);
 }
 
 static Inkscape::Filters::FilterBlendMode sp_feBlend_readmode(gchar const *value)
@@ -186,8 +159,8 @@ sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value)
             }
             break;
         default:
-            if (((SPObjectClass *) feBlend_parent_class)->set)
-                ((SPObjectClass *) feBlend_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feBlend_parent_class)->set)
+                ((SPObjectClass *) sp_feBlend_parent_class)->set(object, key, value);
             break;
     }
 
@@ -218,8 +191,8 @@ sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags)
         object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, blend->in2));
     }
 
-    if (((SPObjectClass *) feBlend_parent_class)->update) {
-        ((SPObjectClass *) feBlend_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feBlend_parent_class)->update) {
+        ((SPObjectClass *) sp_feBlend_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -267,8 +240,8 @@ sp_feBlend_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::
     }
     repr->setAttribute("mode", mode);
 
-    if (((SPObjectClass *) feBlend_parent_class)->write) {
-        ((SPObjectClass *) feBlend_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feBlend_parent_class)->write) {
+        ((SPObjectClass *) sp_feBlend_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index b88b84037..aaf1c2986 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -30,10 +30,6 @@
 #include "display/nr-filter-colormatrix.h"
 
 /* FeColorMatrix base class */
-
-static void sp_feColorMatrix_class_init(SPFeColorMatrixClass *klass);
-static void sp_feColorMatrix_init(SPFeColorMatrix *feColorMatrix);
-
 static void sp_feColorMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feColorMatrix_release(SPObject *object);
 static void sp_feColorMatrix_set(SPObject *object, unsigned int key, gchar const *value);
@@ -41,28 +37,7 @@ static void sp_feColorMatrix_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feColorMatrix_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feColorMatrix_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feColorMatrix_parent_class;
-
-GType
-sp_feColorMatrix_get_type()
-{
-    static GType feColorMatrix_type = 0;
-
-    if (!feColorMatrix_type) {
-        GTypeInfo feColorMatrix_info = {
-            sizeof(SPFeColorMatrixClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feColorMatrix_class_init,
-            NULL, NULL,
-            sizeof(SPFeColorMatrix),
-            16,
-            (GInstanceInitFunc) sp_feColorMatrix_init,
-            NULL,    /* value_table */
-        };
-        feColorMatrix_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeColorMatrix", &feColorMatrix_info, (GTypeFlags)0);
-    }
-    return feColorMatrix_type;
-}
+G_DEFINE_TYPE(SPFeColorMatrix, sp_feColorMatrix, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feColorMatrix_class_init(SPFeColorMatrixClass *klass)
@@ -70,8 +45,6 @@ sp_feColorMatrix_class_init(SPFeColorMatrixClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feColorMatrix_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feColorMatrix_build;
     sp_object_class->release = sp_feColorMatrix_release;
     sp_object_class->write = sp_feColorMatrix_write;
@@ -93,8 +66,8 @@ sp_feColorMatrix_init(SPFeColorMatrix */*feColorMatrix*/)
 static void
 sp_feColorMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feColorMatrix_parent_class)->build) {
-        ((SPObjectClass *) feColorMatrix_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feColorMatrix_parent_class)->build) {
+        ((SPObjectClass *) sp_feColorMatrix_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -108,8 +81,8 @@ sp_feColorMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::No
 static void
 sp_feColorMatrix_release(SPObject *object)
 {
-    if (((SPObjectClass *) feColorMatrix_parent_class)->release)
-        ((SPObjectClass *) feColorMatrix_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feColorMatrix_parent_class)->release)
+        ((SPObjectClass *) sp_feColorMatrix_parent_class)->release(object);
 }
 
 static Inkscape::Filters::FilterColorMatrixType sp_feColorMatrix_read_type(gchar const *value){
@@ -158,8 +131,8 @@ sp_feColorMatrix_set(SPObject *object, unsigned int key, gchar const *str)
             }
             break;
         default:
-            if (((SPObjectClass *) feColorMatrix_parent_class)->set)
-                ((SPObjectClass *) feColorMatrix_parent_class)->set(object, key, str);
+            if (((SPObjectClass *) sp_feColorMatrix_parent_class)->set)
+                ((SPObjectClass *) sp_feColorMatrix_parent_class)->set(object, key, str);
             break;
     }
 }
@@ -177,8 +150,8 @@ sp_feColorMatrix_update(SPObject *object, SPCtx *ctx, guint flags)
 
     }
 
-    if (((SPObjectClass *) feColorMatrix_parent_class)->update) {
-        ((SPObjectClass *) feColorMatrix_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feColorMatrix_parent_class)->update) {
+        ((SPObjectClass *) sp_feColorMatrix_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -194,8 +167,8 @@ sp_feColorMatrix_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape:
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) feColorMatrix_parent_class)->write) {
-        ((SPObjectClass *) feColorMatrix_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feColorMatrix_parent_class)->write) {
+        ((SPObjectClass *) sp_feColorMatrix_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index 8cc388dd0..71e1ffe8e 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -28,10 +28,6 @@
 #include "display/nr-filter-component-transfer.h"
 
 /* FeComponentTransfer base class */
-
-static void sp_feComponentTransfer_class_init(SPFeComponentTransferClass *klass);
-static void sp_feComponentTransfer_init(SPFeComponentTransfer *feComponentTransfer);
-
 static void sp_feComponentTransfer_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feComponentTransfer_release(SPObject *object);
 static void sp_feComponentTransfer_set(SPObject *object, unsigned int key, gchar const *value);
@@ -40,35 +36,14 @@ static void sp_feComponentTransfer_build_renderer(SPFilterPrimitive *primitive,
 static void sp_feComponentTransfer_remove_child(SPObject *object, Inkscape::XML::Node *child);
 static void sp_feComponentTransfer_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref);
 static Inkscape::XML::Node *sp_feComponentTransfer_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-static SPFilterPrimitiveClass *feComponentTransfer_parent_class;
 
-GType
-sp_feComponentTransfer_get_type()
-{
-    static GType feComponentTransfer_type = 0;
-
-    if (!feComponentTransfer_type) {
-        GTypeInfo feComponentTransfer_info = {
-            sizeof(SPFeComponentTransferClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feComponentTransfer_class_init,
-            NULL, NULL,
-            sizeof(SPFeComponentTransfer),
-            16,
-            (GInstanceInitFunc) sp_feComponentTransfer_init,
-            NULL,    /* value_table */
-        };
-        feComponentTransfer_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeComponentTransfer", &feComponentTransfer_info, (GTypeFlags)0);
-    }
-    return feComponentTransfer_type;
-}
+G_DEFINE_TYPE(SPFeComponentTransfer, sp_feComponentTransfer, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feComponentTransfer_class_init(SPFeComponentTransferClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
-    feComponentTransfer_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
 
     sp_object_class->build = sp_feComponentTransfer_build;
     sp_object_class->release = sp_feComponentTransfer_release;
@@ -93,8 +68,8 @@ sp_feComponentTransfer_init(SPFeComponentTransfer */*feComponentTransfer*/)
 static void
 sp_feComponentTransfer_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feComponentTransfer_parent_class)->build) {
-        ((SPObjectClass *) feComponentTransfer_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feComponentTransfer_parent_class)->build) {
+        ((SPObjectClass *) sp_feComponentTransfer_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -144,8 +119,8 @@ sp_feComponentTransfer_child_added(SPObject *object, Inkscape::XML::Node *child,
 {
     SPFeComponentTransfer *f = SP_FECOMPONENTTRANSFER(object);
 
-    if (((SPObjectClass *) feComponentTransfer_parent_class)->child_added)
-        (* ((SPObjectClass *) feComponentTransfer_parent_class)->child_added)(object, child, ref);
+    if (((SPObjectClass *) sp_feComponentTransfer_parent_class)->child_added)
+        (* ((SPObjectClass *) sp_feComponentTransfer_parent_class)->child_added)(object, child, ref);
 
     sp_feComponentTransfer_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -160,8 +135,8 @@ sp_feComponentTransfer_remove_child(SPObject *object, Inkscape::XML::Node *child
 {
     SPFeComponentTransfer *f = SP_FECOMPONENTTRANSFER(object);
 
-    if (((SPObjectClass *) feComponentTransfer_parent_class)->remove_child)
-        (* ((SPObjectClass *) feComponentTransfer_parent_class)->remove_child)(object, child);
+    if (((SPObjectClass *) sp_feComponentTransfer_parent_class)->remove_child)
+        (* ((SPObjectClass *) sp_feComponentTransfer_parent_class)->remove_child)(object, child);
 
     sp_feComponentTransfer_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -173,8 +148,8 @@ sp_feComponentTransfer_remove_child(SPObject *object, Inkscape::XML::Node *child
 static void
 sp_feComponentTransfer_release(SPObject *object)
 {
-    if (((SPObjectClass *) feComponentTransfer_parent_class)->release)
-        ((SPObjectClass *) feComponentTransfer_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feComponentTransfer_parent_class)->release)
+        ((SPObjectClass *) sp_feComponentTransfer_parent_class)->release(object);
 }
 
 /**
@@ -189,8 +164,8 @@ sp_feComponentTransfer_set(SPObject *object, unsigned int key, gchar const *valu
     switch(key) {
         /*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-            if (((SPObjectClass *) feComponentTransfer_parent_class)->set)
-                ((SPObjectClass *) feComponentTransfer_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feComponentTransfer_parent_class)->set)
+                ((SPObjectClass *) sp_feComponentTransfer_parent_class)->set(object, key, value);
             break;
     }
 }
@@ -208,8 +183,8 @@ sp_feComponentTransfer_update(SPObject *object, SPCtx *ctx, guint flags)
 
     }
 
-    if (((SPObjectClass *) feComponentTransfer_parent_class)->update) {
-        ((SPObjectClass *) feComponentTransfer_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feComponentTransfer_parent_class)->update) {
+        ((SPObjectClass *) sp_feComponentTransfer_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -225,8 +200,8 @@ sp_feComponentTransfer_write(SPObject *object, Inkscape::XML::Document *doc, Ink
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) feComponentTransfer_parent_class)->write) {
-        ((SPObjectClass *) feComponentTransfer_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feComponentTransfer_parent_class)->write) {
+        ((SPObjectClass *) sp_feComponentTransfer_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index 66e8e3415..d490f336c 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -26,10 +26,6 @@
 #include "sp-filter.h"
 
 /* FeComposite base class */
-
-static void sp_feComposite_class_init(SPFeCompositeClass *klass);
-static void sp_feComposite_init(SPFeComposite *feComposite);
-
 static void sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feComposite_release(SPObject *object);
 static void sp_feComposite_set(SPObject *object, unsigned int key, gchar const *value);
@@ -37,28 +33,7 @@ static void sp_feComposite_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feComposite_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feComposite_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feComposite_parent_class;
-
-GType
-sp_feComposite_get_type()
-{
-    static GType feComposite_type = 0;
-
-    if (!feComposite_type) {
-        GTypeInfo feComposite_info = {
-            sizeof(SPFeCompositeClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feComposite_class_init,
-            NULL, NULL,
-            sizeof(SPFeComposite),
-            16,
-            (GInstanceInitFunc) sp_feComposite_init,
-            NULL,    /* value_table */
-        };
-        feComposite_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeComposite", &feComposite_info, (GTypeFlags)0);
-    }
-    return feComposite_type;
-}
+G_DEFINE_TYPE(SPFeComposite, sp_feComposite, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feComposite_class_init(SPFeCompositeClass *klass)
@@ -66,8 +41,6 @@ sp_feComposite_class_init(SPFeCompositeClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feComposite_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feComposite_build;
     sp_object_class->release = sp_feComposite_release;
     sp_object_class->write = sp_feComposite_write;
@@ -96,8 +69,8 @@ sp_feComposite_init(SPFeComposite *feComposite)
 static void
 sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feComposite_parent_class)->build) {
-        ((SPObjectClass *) feComposite_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feComposite_parent_class)->build) {
+        ((SPObjectClass *) sp_feComposite_parent_class)->build(object, document, repr);
     }
 
     SPFeComposite *comp = SP_FECOMPOSITE(object);
@@ -128,8 +101,8 @@ sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node
 static void
 sp_feComposite_release(SPObject *object)
 {
-    if (((SPObjectClass *) feComposite_parent_class)->release)
-        ((SPObjectClass *) feComposite_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feComposite_parent_class)->release)
+        ((SPObjectClass *) sp_feComposite_parent_class)->release(object);
 }
 
 static FeCompositeOperator
@@ -212,8 +185,8 @@ sp_feComposite_set(SPObject *object, unsigned int key, gchar const *value)
             break;
 
         default:
-            if (((SPObjectClass *) feComposite_parent_class)->set)
-                ((SPObjectClass *) feComposite_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feComposite_parent_class)->set)
+                ((SPObjectClass *) sp_feComposite_parent_class)->set(object, key, value);
             break;
     }
 
@@ -246,8 +219,8 @@ sp_feComposite_update(SPObject *object, SPCtx *ctx, guint flags)
         object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, comp->in2));
     }
 
-    if (((SPObjectClass *) feComposite_parent_class)->update) {
-        ((SPObjectClass *) feComposite_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feComposite_parent_class)->update) {
+        ((SPObjectClass *) sp_feComposite_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -309,8 +282,8 @@ sp_feComposite_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::X
         repr->setAttribute("k4", 0);
     }
 
-    if (((SPObjectClass *) feComposite_parent_class)->write) {
-        ((SPObjectClass *) feComposite_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feComposite_parent_class)->write) {
+        ((SPObjectClass *) sp_feComposite_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 470bfb64a..d002ef731 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -29,10 +29,6 @@
 #include "display/nr-filter-convolve-matrix.h"
 
 /* FeConvolveMatrix base class */
-
-static void sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass);
-static void sp_feConvolveMatrix_init(SPFeConvolveMatrix *feConvolveMatrix);
-
 static void sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feConvolveMatrix_release(SPObject *object);
 static void sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value);
@@ -40,28 +36,7 @@ static void sp_feConvolveMatrix_update(SPObject *object, SPCtx *ctx, guint flags
 static Inkscape::XML::Node *sp_feConvolveMatrix_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feConvolveMatrix_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feConvolveMatrix_parent_class;
-
-GType
-sp_feConvolveMatrix_get_type()
-{
-    static GType feConvolveMatrix_type = 0;
-
-    if (!feConvolveMatrix_type) {
-        GTypeInfo feConvolveMatrix_info = {
-            sizeof(SPFeConvolveMatrixClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feConvolveMatrix_class_init,
-            NULL, NULL,
-            sizeof(SPFeConvolveMatrix),
-            16,
-            (GInstanceInitFunc) sp_feConvolveMatrix_init,
-            NULL,    /* value_table */
-        };
-        feConvolveMatrix_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeConvolveMatrix", &feConvolveMatrix_info, (GTypeFlags)0);
-    }
-    return feConvolveMatrix_type;
-}
+G_DEFINE_TYPE(SPFeConvolveMatrix, sp_feConvolveMatrix, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass)
@@ -69,8 +44,6 @@ sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feConvolveMatrix_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feConvolveMatrix_build;
     sp_object_class->release = sp_feConvolveMatrix_release;
     sp_object_class->write = sp_feConvolveMatrix_write;
@@ -104,8 +77,8 @@ sp_feConvolveMatrix_init(SPFeConvolveMatrix *feConvolveMatrix)
 static void
 sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feConvolveMatrix_parent_class)->build) {
-        ((SPObjectClass *) feConvolveMatrix_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feConvolveMatrix_parent_class)->build) {
+        ((SPObjectClass *) sp_feConvolveMatrix_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -126,8 +99,8 @@ sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML:
 static void
 sp_feConvolveMatrix_release(SPObject *object)
 {
-    if (((SPObjectClass *) feConvolveMatrix_parent_class)->release)
-        ((SPObjectClass *) feConvolveMatrix_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feConvolveMatrix_parent_class)->release)
+        ((SPObjectClass *) sp_feConvolveMatrix_parent_class)->release(object);
 }
 
 static Inkscape::Filters::FilterConvolveMatrixEdgeMode sp_feConvolveMatrix_read_edgeMode(gchar const *value){
@@ -265,8 +238,8 @@ sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value)
             }
             break;
         default:
-            if (((SPObjectClass *) feConvolveMatrix_parent_class)->set)
-                ((SPObjectClass *) feConvolveMatrix_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feConvolveMatrix_parent_class)->set)
+                ((SPObjectClass *) sp_feConvolveMatrix_parent_class)->set(object, key, value);
             break;
     }
 
@@ -285,8 +258,8 @@ sp_feConvolveMatrix_update(SPObject *object, SPCtx *ctx, guint flags)
 
     }
 
-    if (((SPObjectClass *) feConvolveMatrix_parent_class)->update) {
-        ((SPObjectClass *) feConvolveMatrix_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feConvolveMatrix_parent_class)->update) {
+        ((SPObjectClass *) sp_feConvolveMatrix_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -303,8 +276,8 @@ sp_feConvolveMatrix_write(SPObject *object, Inkscape::XML::Document *doc, Inksca
     }
 
 
-    if (((SPObjectClass *) feConvolveMatrix_parent_class)->write) {
-        ((SPObjectClass *) feConvolveMatrix_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feConvolveMatrix_parent_class)->write) {
+        ((SPObjectClass *) sp_feConvolveMatrix_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp
index 0f2f29d67..2e69f7555 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -31,10 +31,6 @@
 #include "display/nr-filter-diffuselighting.h"
 
 /* FeDiffuseLighting base class */
-
-static void sp_feDiffuseLighting_class_init(SPFeDiffuseLightingClass *klass);
-static void sp_feDiffuseLighting_init(SPFeDiffuseLighting *feDiffuseLighting);
-
 static void sp_feDiffuseLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feDiffuseLighting_release(SPObject *object);
 static void sp_feDiffuseLighting_set(SPObject *object, unsigned int key, gchar const *value);
@@ -52,35 +48,13 @@ static Inkscape::XML::Node *sp_feDiffuseLighting_write(SPObject *object, Inkscap
 static void sp_feDiffuseLighting_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 static void sp_feDiffuseLighting_children_modified(SPFeDiffuseLighting *sp_diffuselighting);
 
-static SPFilterPrimitiveClass *feDiffuseLighting_parent_class;
-
-GType
-sp_feDiffuseLighting_get_type()
-{
-    static GType feDiffuseLighting_type = 0;
-
-    if (!feDiffuseLighting_type) {
-        GTypeInfo feDiffuseLighting_info = {
-            sizeof(SPFeDiffuseLightingClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feDiffuseLighting_class_init,
-            NULL, NULL,
-            sizeof(SPFeDiffuseLighting),
-            16,
-            (GInstanceInitFunc) sp_feDiffuseLighting_init,
-            NULL,    /* value_table */
-        };
-        feDiffuseLighting_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeDiffuseLighting", &feDiffuseLighting_info, (GTypeFlags)0);
-    }
-    return feDiffuseLighting_type;
-}
+G_DEFINE_TYPE(SPFeDiffuseLighting, sp_feDiffuseLighting, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feDiffuseLighting_class_init(SPFeDiffuseLightingClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
-    feDiffuseLighting_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
 
     sp_object_class->build = sp_feDiffuseLighting_build;
     sp_object_class->release = sp_feDiffuseLighting_release;
@@ -116,8 +90,8 @@ sp_feDiffuseLighting_init(SPFeDiffuseLighting *feDiffuseLighting)
 static void
 sp_feDiffuseLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feDiffuseLighting_parent_class)->build) {
-        ((SPObjectClass *) feDiffuseLighting_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feDiffuseLighting_parent_class)->build) {
+        ((SPObjectClass *) sp_feDiffuseLighting_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -134,8 +108,8 @@ sp_feDiffuseLighting_build(SPObject *object, SPDocument *document, Inkscape::XML
 static void
 sp_feDiffuseLighting_release(SPObject *object)
 {
-    if (((SPObjectClass *) feDiffuseLighting_parent_class)->release)
-        ((SPObjectClass *) feDiffuseLighting_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feDiffuseLighting_parent_class)->release)
+        ((SPObjectClass *) sp_feDiffuseLighting_parent_class)->release(object);
 }
 
 /**
@@ -213,8 +187,8 @@ sp_feDiffuseLighting_set(SPObject *object, unsigned int key, gchar const *value)
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-            if (((SPObjectClass *) feDiffuseLighting_parent_class)->set)
-                ((SPObjectClass *) feDiffuseLighting_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feDiffuseLighting_parent_class)->set)
+                ((SPObjectClass *) sp_feDiffuseLighting_parent_class)->set(object, key, value);
             break;
     }
 
@@ -233,8 +207,8 @@ sp_feDiffuseLighting_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "lighting-color" );
     }
 
-    if (((SPObjectClass *) feDiffuseLighting_parent_class)->update) {
-        ((SPObjectClass *) feDiffuseLighting_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feDiffuseLighting_parent_class)->update) {
+        ((SPObjectClass *) sp_feDiffuseLighting_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -269,8 +243,8 @@ sp_feDiffuseLighting_write(SPObject *object, Inkscape::XML::Document *doc, Inksc
     } else
         repr->setAttribute("lighting-color", NULL);
         
-    if (((SPObjectClass *) feDiffuseLighting_parent_class)->write) {
-        ((SPObjectClass *) feDiffuseLighting_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feDiffuseLighting_parent_class)->write) {
+        ((SPObjectClass *) sp_feDiffuseLighting_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
@@ -284,8 +258,8 @@ sp_feDiffuseLighting_child_added(SPObject *object, Inkscape::XML::Node *child, I
 {
     SPFeDiffuseLighting *f = SP_FEDIFFUSELIGHTING(object);
 
-    if (((SPObjectClass *) feDiffuseLighting_parent_class)->child_added)
-        (* ((SPObjectClass *) feDiffuseLighting_parent_class)->child_added)(object, child, ref);
+    if (((SPObjectClass *) sp_feDiffuseLighting_parent_class)->child_added)
+        (* ((SPObjectClass *) sp_feDiffuseLighting_parent_class)->child_added)(object, child, ref);
 
     sp_feDiffuseLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -300,8 +274,8 @@ sp_feDiffuseLighting_remove_child(SPObject *object, Inkscape::XML::Node *child)
 {   
     SPFeDiffuseLighting *f = SP_FEDIFFUSELIGHTING(object);
 
-    if (((SPObjectClass *) feDiffuseLighting_parent_class)->remove_child)
-        (* ((SPObjectClass *) feDiffuseLighting_parent_class)->remove_child)(object, child);   
+    if (((SPObjectClass *) sp_feDiffuseLighting_parent_class)->remove_child)
+        (* ((SPObjectClass *) sp_feDiffuseLighting_parent_class)->remove_child)(object, child);   
 
     sp_feDiffuseLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -311,8 +285,8 @@ static void
 sp_feDiffuseLighting_order_changed (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref)
 {
     SPFeDiffuseLighting *f = SP_FEDIFFUSELIGHTING(object);
-    if (((SPObjectClass *) (feDiffuseLighting_parent_class))->order_changed)
-        (* ((SPObjectClass *) (feDiffuseLighting_parent_class))->order_changed) (object, child, old_ref, new_ref);
+    if (((SPObjectClass *) (sp_feDiffuseLighting_parent_class))->order_changed)
+        (* ((SPObjectClass *) (sp_feDiffuseLighting_parent_class))->order_changed) (object, child, old_ref, new_ref);
 
     sp_feDiffuseLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index 69a678c26..408ffce9e 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -26,10 +26,6 @@
 #include "display/nr-filter-displacement-map.h"
 
 /* FeDisplacementMap base class */
-
-static void sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass);
-static void sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap);
-
 static void sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feDisplacementMap_release(SPObject *object);
 static void sp_feDisplacementMap_set(SPObject *object, unsigned int key, gchar const *value);
@@ -37,28 +33,7 @@ static void sp_feDisplacementMap_update(SPObject *object, SPCtx *ctx, guint flag
 static void sp_feDisplacementMap_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 static Inkscape::XML::Node *sp_feDisplacementMap_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 
-static SPFilterPrimitiveClass *feDisplacementMap_parent_class;
-
-GType
-sp_feDisplacementMap_get_type()
-{
-    static GType feDisplacementMap_type = 0;
-
-    if (!feDisplacementMap_type) {
-        GTypeInfo feDisplacementMap_info = {
-            sizeof(SPFeDisplacementMapClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feDisplacementMap_class_init,
-            NULL, NULL,
-            sizeof(SPFeDisplacementMap),
-            16,
-            (GInstanceInitFunc) sp_feDisplacementMap_init,
-            NULL,    /* value_table */
-        };
-        feDisplacementMap_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeDisplacementMap", &feDisplacementMap_info, (GTypeFlags)0);
-    }
-    return feDisplacementMap_type;
-}
+G_DEFINE_TYPE(SPFeDisplacementMap, sp_feDisplacementMap, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass)
@@ -66,8 +41,6 @@ sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feDisplacementMap_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feDisplacementMap_build;
     sp_object_class->release = sp_feDisplacementMap_release;
     sp_object_class->write = sp_feDisplacementMap_write;
@@ -93,8 +66,8 @@ sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap)
 static void
 sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->build) {
-        ((SPObjectClass *) feDisplacementMap_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feDisplacementMap_parent_class)->build) {
+        ((SPObjectClass *) sp_feDisplacementMap_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -121,8 +94,8 @@ sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML
 static void
 sp_feDisplacementMap_release(SPObject *object)
 {
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->release)
-        ((SPObjectClass *) feDisplacementMap_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feDisplacementMap_parent_class)->release)
+        ((SPObjectClass *) sp_feDisplacementMap_parent_class)->release(object);
 }
 
 static FilterDisplacementMapChannelSelector sp_feDisplacementMap_readChannelSelector(gchar const *value)
@@ -191,8 +164,8 @@ sp_feDisplacementMap_set(SPObject *object, unsigned int key, gchar const *value)
             }
             break;
         default:
-            if (((SPObjectClass *) feDisplacementMap_parent_class)->set)
-                ((SPObjectClass *) feDisplacementMap_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feDisplacementMap_parent_class)->set)
+                ((SPObjectClass *) sp_feDisplacementMap_parent_class)->set(object, key, value);
             break;
     }
 
@@ -224,8 +197,8 @@ sp_feDisplacementMap_update(SPObject *object, SPCtx *ctx, guint flags)
         object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, disp->in2));
     }
 
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->update) {
-        ((SPObjectClass *) feDisplacementMap_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feDisplacementMap_parent_class)->update) {
+        ((SPObjectClass *) sp_feDisplacementMap_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -277,8 +250,8 @@ sp_feDisplacementMap_write(SPObject *object, Inkscape::XML::Document *doc, Inksc
     repr->setAttribute("yChannelSelector",
                        get_channelselector_name(disp->yChannelSelector));
 
-    if (((SPObjectClass *) feDisplacementMap_parent_class)->write) {
-        ((SPObjectClass *) feDisplacementMap_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feDisplacementMap_parent_class)->write) {
+        ((SPObjectClass *) sp_feDisplacementMap_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp
index 891049415..5e1c35a95 100644
--- a/src/filters/distantlight.cpp
+++ b/src/filters/distantlight.cpp
@@ -30,47 +30,19 @@
 #include "macros.h"
 
 /* FeDistantLight class */
-
-static void sp_fedistantlight_class_init(SPFeDistantLightClass *klass);
-static void sp_fedistantlight_init(SPFeDistantLight *fedistantlight);
-
 static void sp_fedistantlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_fedistantlight_release(SPObject *object);
 static void sp_fedistantlight_set(SPObject *object, unsigned int key, gchar const *value);
 static void sp_fedistantlight_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_fedistantlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 
-static SPObjectClass *feDistantLight_parent_class;
-
-GType
-sp_fedistantlight_get_type()
-{
-    static GType fedistantlight_type = 0;
-
-    if (!fedistantlight_type) {
-        GTypeInfo fedistantlight_info = {
-            sizeof(SPFeDistantLightClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_fedistantlight_class_init,
-            NULL, NULL,
-            sizeof(SPFeDistantLight),
-            16,
-            (GInstanceInitFunc) sp_fedistantlight_init,
-            NULL,    /* value_table */
-        };
-        fedistantlight_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeDistantLight", &fedistantlight_info, (GTypeFlags)0);
-    }
-    return fedistantlight_type;
-}
+G_DEFINE_TYPE(SPFeDistantLight, sp_fedistantlight, SP_TYPE_OBJECT);
 
 static void
 sp_fedistantlight_class_init(SPFeDistantLightClass *klass)
 {
-
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
 
-    feDistantLight_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_fedistantlight_build;
     sp_object_class->release = sp_fedistantlight_release;
     sp_object_class->write = sp_fedistantlight_write;
@@ -95,8 +67,8 @@ sp_fedistantlight_init(SPFeDistantLight *fedistantlight)
 static void
 sp_fedistantlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feDistantLight_parent_class)->build) {
-        ((SPObjectClass *) feDistantLight_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_fedistantlight_parent_class)->build) {
+        ((SPObjectClass *) sp_fedistantlight_parent_class)->build(object, document, repr);
     }
 
     //Read values of key attributes from XML nodes into object.
@@ -170,8 +142,8 @@ sp_fedistantlight_set(SPObject *object, unsigned int key, gchar const *value)
         break;
     default:
         // See if any parents need this value.
-        if (((SPObjectClass *) feDistantLight_parent_class)->set) {
-            ((SPObjectClass *) feDistantLight_parent_class)->set(object, key, value);
+        if (((SPObjectClass *) sp_fedistantlight_parent_class)->set) {
+            ((SPObjectClass *) sp_fedistantlight_parent_class)->set(object, key, value);
         }
         break;
     }
@@ -192,8 +164,8 @@ sp_fedistantlight_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "elevation" );
     }
 
-    if (((SPObjectClass *) feDistantLight_parent_class)->update) {
-        ((SPObjectClass *) feDistantLight_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_fedistantlight_parent_class)->update) {
+        ((SPObjectClass *) sp_fedistantlight_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -214,8 +186,8 @@ sp_fedistantlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape
     if (fedistantlight->elevation_set)
         sp_repr_set_css_double(repr, "elevation", fedistantlight->elevation);
 
-    if (((SPObjectClass *) feDistantLight_parent_class)->write) {
-        ((SPObjectClass *) feDistantLight_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_fedistantlight_parent_class)->write) {
+        ((SPObjectClass *) sp_fedistantlight_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp
index ee1af8904..ca93cf6d8 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/filters/gaussian-blur.cpp
@@ -31,10 +31,6 @@
 //#include "macros.h"
 
 /* GaussianBlur base class */
-
-static void sp_gaussianBlur_class_init(SPGaussianBlurClass *klass);
-static void sp_gaussianBlur_init(SPGaussianBlur *gaussianBlur);
-
 static void sp_gaussianBlur_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_gaussianBlur_release(SPObject *object);
 static void sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value);
@@ -42,28 +38,7 @@ static void sp_gaussianBlur_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_gaussianBlur_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *gaussianBlur_parent_class;
-
-GType
-sp_gaussianBlur_get_type()
-{
-    static GType gaussianBlur_type = 0;
-
-    if (!gaussianBlur_type) {
-        GTypeInfo gaussianBlur_info = {
-            sizeof(SPGaussianBlurClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_gaussianBlur_class_init,
-            NULL, NULL,
-            sizeof(SPGaussianBlur),
-            16,
-            (GInstanceInitFunc) sp_gaussianBlur_init,
-            NULL,    /* value_table */
-        };
-        gaussianBlur_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPGaussianBlur", &gaussianBlur_info, (GTypeFlags)0);
-    }
-    return gaussianBlur_type;
-}
+G_DEFINE_TYPE(SPGaussianBlur, sp_gaussianBlur, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_gaussianBlur_class_init(SPGaussianBlurClass *klass)
@@ -71,8 +46,6 @@ sp_gaussianBlur_class_init(SPGaussianBlurClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    gaussianBlur_parent_class = (SPFilterPrimitiveClass *)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_gaussianBlur_build;
     sp_object_class->release = sp_gaussianBlur_release;
     sp_object_class->write = sp_gaussianBlur_write;
@@ -95,8 +68,8 @@ sp_gaussianBlur_init(SPGaussianBlur */*gaussianBlur*/)
 static void
 sp_gaussianBlur_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) gaussianBlur_parent_class)->build) {
-        ((SPObjectClass *) gaussianBlur_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_gaussianBlur_parent_class)->build) {
+        ((SPObjectClass *) sp_gaussianBlur_parent_class)->build(object, document, repr);
     }
 
     object->readAttr( "stdDeviation" );
@@ -110,8 +83,8 @@ static void
 sp_gaussianBlur_release(SPObject *object)
 {
 
-    if (((SPObjectClass *) gaussianBlur_parent_class)->release)
-        ((SPObjectClass *) gaussianBlur_parent_class)->release(object);
+    if (((SPObjectClass *) sp_gaussianBlur_parent_class)->release)
+        ((SPObjectClass *) sp_gaussianBlur_parent_class)->release(object);
 }
 
 /**
@@ -128,8 +101,8 @@ sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value)
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-            if (((SPObjectClass *) gaussianBlur_parent_class)->set)
-                ((SPObjectClass *) gaussianBlur_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_gaussianBlur_parent_class)->set)
+                ((SPObjectClass *) sp_gaussianBlur_parent_class)->set(object, key, value);
             break;
     }
 
@@ -145,8 +118,8 @@ sp_gaussianBlur_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "stdDeviation" );
     }
 
-    if (((SPObjectClass *) gaussianBlur_parent_class)->update) {
-        ((SPObjectClass *) gaussianBlur_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_gaussianBlur_parent_class)->update) {
+        ((SPObjectClass *) sp_gaussianBlur_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -162,8 +135,8 @@ sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) gaussianBlur_parent_class)->write) {
-        ((SPObjectClass *) gaussianBlur_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_gaussianBlur_parent_class)->write) {
+        ((SPObjectClass *) sp_gaussianBlur_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index f6ef310f7..ec31e59a7 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -30,10 +30,6 @@
 #include "display/nr-filter-image.h"
 
 /* FeImage base class */
-
-static void sp_feImage_class_init(SPFeImageClass *klass);
-static void sp_feImage_init(SPFeImage *feImage);
-
 static void sp_feImage_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feImage_release(SPObject *object);
 static void sp_feImage_set(SPObject *object, unsigned int key, gchar const *value);
@@ -41,35 +37,13 @@ static void sp_feImage_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feImage_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feImage_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feImage_parent_class;
-
-GType sp_feImage_get_type()
-{
-    static GType feImage_type = 0;
-
-    if (!feImage_type) {
-        GTypeInfo feImage_info = {
-            sizeof(SPFeImageClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feImage_class_init,
-            NULL, NULL,
-            sizeof(SPFeImage),
-            16,
-            (GInstanceInitFunc) sp_feImage_init,
-            NULL,    /* value_table */
-        };
-        feImage_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeImage", &feImage_info, (GTypeFlags)0);
-    }
-    return feImage_type;
-}
+G_DEFINE_TYPE(SPFeImage, sp_feImage, SP_TYPE_FILTER_PRIMITIVE);
 
 static void sp_feImage_class_init(SPFeImageClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass * sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feImage_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feImage_build;
     sp_object_class->release = sp_feImage_release;
     sp_object_class->write = sp_feImage_write;
@@ -96,8 +70,8 @@ static void sp_feImage_build(SPObject *object, SPDocument *document, Inkscape::X
     SPFeImage *feImage = SP_FEIMAGE(object);
     feImage->document = document;
 
-    if (((SPObjectClass *) feImage_parent_class)->build) {
-        ((SPObjectClass *) feImage_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feImage_parent_class)->build) {
+        ((SPObjectClass *) sp_feImage_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -117,8 +91,8 @@ static void sp_feImage_release(SPObject *object)
     feImage->_href_modified_connection.disconnect();
     if (feImage->SVGElemRef) delete feImage->SVGElemRef;
 
-    if (((SPObjectClass *) feImage_parent_class)->release)
-        ((SPObjectClass *) feImage_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feImage_parent_class)->release)
+        ((SPObjectClass *) sp_feImage_parent_class)->release(object);
 }
 
 static void sp_feImage_elem_modified(SPObject* /*href*/, guint /*flags*/, SPObject* obj)
@@ -247,8 +221,8 @@ static void sp_feImage_set(SPObject *object, unsigned int key, gchar const *valu
             break;
 
         default:
-            if (((SPObjectClass *) feImage_parent_class)->set)
-                ((SPObjectClass *) feImage_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feImage_parent_class)->set)
+                ((SPObjectClass *) sp_feImage_parent_class)->set(object, key, value);
             break;
     }
 
@@ -266,8 +240,8 @@ static void sp_feImage_update(SPObject *object, SPCtx *ctx, guint flags)
         /* do something to trigger redisplay, updates? */
     }
 
-    if (((SPObjectClass *) feImage_parent_class)->update) {
-        ((SPObjectClass *) feImage_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feImage_parent_class)->update) {
+        ((SPObjectClass *) sp_feImage_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -282,8 +256,8 @@ static Inkscape::XML::Node * sp_feImage_write(SPObject *object, Inkscape::XML::D
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) feImage_parent_class)->write) {
-        ((SPObjectClass *) feImage_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feImage_parent_class)->write) {
+        ((SPObjectClass *) sp_feImage_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp
index b5a6d7dad..7346a0892 100644
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
@@ -25,10 +25,6 @@
 #include "display/nr-filter-merge.h"
 
 /* FeMerge base class */
-
-static void sp_feMerge_class_init(SPFeMergeClass *klass);
-static void sp_feMerge_init(SPFeMerge *feMerge);
-
 static void sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feMerge_release(SPObject *object);
 static void sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value);
@@ -36,28 +32,7 @@ static void sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feMerge_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feMerge_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feMerge_parent_class;
-
-GType
-sp_feMerge_get_type()
-{
-    static GType feMerge_type = 0;
-
-    if (!feMerge_type) {
-        GTypeInfo feMerge_info = {
-            sizeof(SPFeMergeClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feMerge_class_init,
-            NULL, NULL,
-            sizeof(SPFeMerge),
-            16,
-            (GInstanceInitFunc) sp_feMerge_init,
-            NULL,    /* value_table */
-        };
-        feMerge_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeMerge", &feMerge_info, (GTypeFlags)0);
-    }
-    return feMerge_type;
-}
+G_DEFINE_TYPE(SPFeMerge, sp_feMerge, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feMerge_class_init(SPFeMergeClass *klass)
@@ -65,8 +40,6 @@ sp_feMerge_class_init(SPFeMergeClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feMerge_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feMerge_build;
     sp_object_class->release = sp_feMerge_release;
     sp_object_class->write = sp_feMerge_write;
@@ -89,8 +62,8 @@ sp_feMerge_init(SPFeMerge */*feMerge*/)
 static void
 sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feMerge_parent_class)->build) {
-        ((SPObjectClass *) feMerge_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feMerge_parent_class)->build) {
+        ((SPObjectClass *) sp_feMerge_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -102,8 +75,8 @@ sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
 static void
 sp_feMerge_release(SPObject *object)
 {
-    if (((SPObjectClass *) feMerge_parent_class)->release)
-        ((SPObjectClass *) feMerge_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feMerge_parent_class)->release)
+        ((SPObjectClass *) sp_feMerge_parent_class)->release(object);
 }
 
 /**
@@ -118,8 +91,8 @@ sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value)
     switch(key) {
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-            if (((SPObjectClass *) feMerge_parent_class)->set)
-                ((SPObjectClass *) feMerge_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feMerge_parent_class)->set)
+                ((SPObjectClass *) sp_feMerge_parent_class)->set(object, key, value);
             break;
     }
 
@@ -135,8 +108,8 @@ sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags)
         object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
     }
 
-    if (((SPObjectClass *) feMerge_parent_class)->update) {
-        ((SPObjectClass *) feMerge_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feMerge_parent_class)->update) {
+        ((SPObjectClass *) sp_feMerge_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -153,8 +126,8 @@ sp_feMerge_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::
     }
 
 
-    if (((SPObjectClass *) feMerge_parent_class)->write) {
-        ((SPObjectClass *) feMerge_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feMerge_parent_class)->write) {
+        ((SPObjectClass *) sp_feMerge_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/mergenode.cpp b/src/filters/mergenode.cpp
index 639928305..fa193ad77 100644
--- a/src/filters/mergenode.cpp
+++ b/src/filters/mergenode.cpp
@@ -23,46 +23,19 @@
 #include "filters/merge.h"
 #include "display/nr-filter-types.h"
 
-static void sp_feMergeNode_class_init(SPFeMergeNodeClass *klass);
-static void sp_feMergeNode_init(SPFeMergeNode *skeleton);
-
 static void sp_feMergeNode_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feMergeNode_release(SPObject *object);
 static void sp_feMergeNode_set(SPObject *object, unsigned int key, gchar const *value);
 static void sp_feMergeNode_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feMergeNode_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 
-static SPObjectClass *feMergeNode_parent_class;
-
-GType
-sp_feMergeNode_get_type()
-{
-    static GType feMergeNode_type = 0;
-
-    if (!feMergeNode_type) {
-        GTypeInfo feMergeNode_info = {
-            sizeof(SPFeMergeNodeClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feMergeNode_class_init,
-            NULL, NULL,
-            sizeof(SPFeMergeNode),
-            16,
-            (GInstanceInitFunc) sp_feMergeNode_init,
-            NULL,    /* value_table */
-        };
-        feMergeNode_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeMergeNode", &feMergeNode_info, (GTypeFlags)0);
-    }
-    return feMergeNode_type;
-}
+G_DEFINE_TYPE(SPFeMergeNode, sp_feMergeNode, SP_TYPE_OBJECT);
 
 static void
 sp_feMergeNode_class_init(SPFeMergeNodeClass *klass)
 {
-    //GObjectClass *gobject_class = (GObjectClass *)klass;
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
 
-    feMergeNode_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feMergeNode_build;
     sp_object_class->release = sp_feMergeNode_release;
     sp_object_class->write = sp_feMergeNode_write;
@@ -95,8 +68,8 @@ sp_feMergeNode_release(SPObject *object)
 {
     /* deal with our children and our selves here */
 
-    if (((SPObjectClass *) feMergeNode_parent_class)->release)
-        ((SPObjectClass *) feMergeNode_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feMergeNode_parent_class)->release)
+        ((SPObjectClass *) sp_feMergeNode_parent_class)->release(object);
 }
 
 /**
@@ -117,8 +90,8 @@ sp_feMergeNode_set(SPObject *object, unsigned int key, gchar const *value)
     }
 
     /* See if any parents need this value. */
-    if (((SPObjectClass *) feMergeNode_parent_class)->set) {
-        ((SPObjectClass *) feMergeNode_parent_class)->set(object, key, value);
+    if (((SPObjectClass *) sp_feMergeNode_parent_class)->set) {
+        ((SPObjectClass *) sp_feMergeNode_parent_class)->set(object, key, value);
     }
 }
 
@@ -134,8 +107,8 @@ sp_feMergeNode_update(SPObject *object, SPCtx *ctx, guint flags)
         object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
     }
 
-    if (((SPObjectClass *) feMergeNode_parent_class)->update) {
-        ((SPObjectClass *) feMergeNode_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feMergeNode_parent_class)->update) {
+        ((SPObjectClass *) sp_feMergeNode_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -157,8 +130,8 @@ sp_feMergeNode_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::X
         }
     }
 
-    if (((SPObjectClass *) feMergeNode_parent_class)->write) {
-        ((SPObjectClass *) feMergeNode_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feMergeNode_parent_class)->write) {
+        ((SPObjectClass *) sp_feMergeNode_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index 42327d59f..886a10311 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -27,10 +27,6 @@
 #include "display/nr-filter-morphology.h"
 
 /* FeMorphology base class */
-
-static void sp_feMorphology_class_init(SPFeMorphologyClass *klass);
-static void sp_feMorphology_init(SPFeMorphology *feMorphology);
-
 static void sp_feMorphology_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feMorphology_release(SPObject *object);
 static void sp_feMorphology_set(SPObject *object, unsigned int key, gchar const *value);
@@ -38,36 +34,13 @@ static void sp_feMorphology_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feMorphology_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feMorphology_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feMorphology_parent_class;
-
-GType
-sp_feMorphology_get_type()
-{
-    static GType feMorphology_type = 0;
-
-    if (!feMorphology_type) {
-        GTypeInfo feMorphology_info = {
-            sizeof(SPFeMorphologyClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feMorphology_class_init,
-            NULL, NULL,
-            sizeof(SPFeMorphology),
-            16,
-            (GInstanceInitFunc) sp_feMorphology_init,
-            NULL,    /* value_table */
-        };
-        feMorphology_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeMorphology", &feMorphology_info, (GTypeFlags)0);
-    }
-    return feMorphology_type;
-}
+G_DEFINE_TYPE(SPFeMorphology, sp_feMorphology, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feMorphology_class_init(SPFeMorphologyClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
-    
-    feMorphology_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
 
     sp_object_class->build = sp_feMorphology_build;
     sp_object_class->release = sp_feMorphology_release;
@@ -92,8 +65,8 @@ sp_feMorphology_init(SPFeMorphology *feMorphology)
 static void
 sp_feMorphology_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feMorphology_parent_class)->build) {
-        ((SPObjectClass *) feMorphology_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feMorphology_parent_class)->build) {
+        ((SPObjectClass *) sp_feMorphology_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -107,8 +80,8 @@ sp_feMorphology_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
 static void
 sp_feMorphology_release(SPObject *object)
 {
-    if (((SPObjectClass *) feMorphology_parent_class)->release)
-        ((SPObjectClass *) feMorphology_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feMorphology_parent_class)->release)
+        ((SPObjectClass *) sp_feMorphology_parent_class)->release(object);
 }
 
 static Inkscape::Filters::FilterMorphologyOperator sp_feMorphology_read_operator(gchar const *value){
@@ -151,8 +124,8 @@ sp_feMorphology_set(SPObject *object, unsigned int key, gchar const *value)
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-            if (((SPObjectClass *) feMorphology_parent_class)->set)
-                ((SPObjectClass *) feMorphology_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feMorphology_parent_class)->set)
+                ((SPObjectClass *) sp_feMorphology_parent_class)->set(object, key, value);
             break;
     }
 
@@ -171,8 +144,8 @@ sp_feMorphology_update(SPObject *object, SPCtx *ctx, guint flags)
 
     }
 
-    if (((SPObjectClass *) feMorphology_parent_class)->update) {
-        ((SPObjectClass *) feMorphology_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feMorphology_parent_class)->update) {
+        ((SPObjectClass *) sp_feMorphology_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -188,8 +161,8 @@ sp_feMorphology_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) feMorphology_parent_class)->write) {
-        ((SPObjectClass *) feMorphology_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feMorphology_parent_class)->write) {
+        ((SPObjectClass *) sp_feMorphology_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp
index f45169aba..2851f4f7d 100644
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
@@ -26,10 +26,6 @@
 #include "display/nr-filter-offset.h"
 
 /* FeOffset base class */
-
-static void sp_feOffset_class_init(SPFeOffsetClass *klass);
-static void sp_feOffset_init(SPFeOffset *feOffset);
-
 static void sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feOffset_release(SPObject *object);
 static void sp_feOffset_set(SPObject *object, unsigned int key, gchar const *value);
@@ -37,28 +33,7 @@ static void sp_feOffset_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feOffset_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feOffset_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feOffset_parent_class;
-
-GType
-sp_feOffset_get_type()
-{
-    static GType feOffset_type = 0;
-
-    if (!feOffset_type) {
-        GTypeInfo feOffset_info = {
-            sizeof(SPFeOffsetClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feOffset_class_init,
-            NULL, NULL,
-            sizeof(SPFeOffset),
-            16,
-            (GInstanceInitFunc) sp_feOffset_init,
-            NULL,    /* value_table */
-        };
-        feOffset_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeOffset", &feOffset_info, (GTypeFlags)0);
-    }
-    return feOffset_type;
-}
+G_DEFINE_TYPE(SPFeOffset, sp_feOffset, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feOffset_class_init(SPFeOffsetClass *klass)
@@ -66,8 +41,6 @@ sp_feOffset_class_init(SPFeOffsetClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feOffset_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feOffset_build;
     sp_object_class->release = sp_feOffset_release;
     sp_object_class->write = sp_feOffset_write;
@@ -92,8 +65,8 @@ sp_feOffset_init(SPFeOffset *feOffset)
 static void
 sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feOffset_parent_class)->build) {
-        ((SPObjectClass *) feOffset_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feOffset_parent_class)->build) {
+        ((SPObjectClass *) sp_feOffset_parent_class)->build(object, document, repr);
     }
 
     object->readAttr( "dx" );
@@ -106,8 +79,8 @@ sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *r
 static void
 sp_feOffset_release(SPObject *object)
 {
-    if (((SPObjectClass *) feOffset_parent_class)->release)
-        ((SPObjectClass *) feOffset_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feOffset_parent_class)->release)
+        ((SPObjectClass *) sp_feOffset_parent_class)->release(object);
 }
 
 /**
@@ -137,8 +110,8 @@ sp_feOffset_set(SPObject *object, unsigned int key, gchar const *value)
             
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-            if (((SPObjectClass *) feOffset_parent_class)->set)
-                ((SPObjectClass *) feOffset_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feOffset_parent_class)->set)
+                ((SPObjectClass *) sp_feOffset_parent_class)->set(object, key, value);
             break;
     }
 
@@ -155,8 +128,8 @@ sp_feOffset_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "dy" );
     }
 
-    if (((SPObjectClass *) feOffset_parent_class)->update) {
-        ((SPObjectClass *) feOffset_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feOffset_parent_class)->update) {
+        ((SPObjectClass *) sp_feOffset_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -172,8 +145,8 @@ sp_feOffset_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML:
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) feOffset_parent_class)->write) {
-        ((SPObjectClass *) feOffset_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feOffset_parent_class)->write) {
+        ((SPObjectClass *) sp_feOffset_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index ee6824d00..a512172d1 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -30,47 +30,19 @@
 #include "macros.h"
 
 /* FePointLight class */
-
-static void sp_fepointlight_class_init(SPFePointLightClass *klass);
-static void sp_fepointlight_init(SPFePointLight *fepointlight);
-
 static void sp_fepointlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_fepointlight_release(SPObject *object);
 static void sp_fepointlight_set(SPObject *object, unsigned int key, gchar const *value);
 static void sp_fepointlight_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_fepointlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 
-static SPObjectClass *fePointLight_parent_class;
-
-GType
-sp_fepointlight_get_type()
-{
-    static GType fepointlight_type = 0;
-
-    if (!fepointlight_type) {
-        GTypeInfo fepointlight_info = {
-            sizeof(SPFePointLightClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_fepointlight_class_init,
-            NULL, NULL,
-            sizeof(SPFePointLight),
-            16,
-            (GInstanceInitFunc) sp_fepointlight_init,
-            NULL,    /* value_table */
-        };
-        fepointlight_type = g_type_register_static(SP_TYPE_OBJECT, "SPFePointLight", &fepointlight_info, (GTypeFlags)0);
-    }
-    return fepointlight_type;
-}
+G_DEFINE_TYPE(SPFePointLight, sp_fepointlight, SP_TYPE_OBJECT);
 
 static void
 sp_fepointlight_class_init(SPFePointLightClass *klass)
 {
-
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
 
-    fePointLight_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_fepointlight_build;
     sp_object_class->release = sp_fepointlight_release;
     sp_object_class->write = sp_fepointlight_write;
@@ -98,8 +70,8 @@ sp_fepointlight_init(SPFePointLight *fepointlight)
 static void
 sp_fepointlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) fePointLight_parent_class)->build) {
-        ((SPObjectClass *) fePointLight_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_fepointlight_parent_class)->build) {
+        ((SPObjectClass *) sp_fepointlight_parent_class)->build(object, document, repr);
     }
 
     //Read values of key attributes from XML nodes into object.
@@ -192,8 +164,8 @@ sp_fepointlight_set(SPObject *object, unsigned int key, gchar const *value)
         break;
     default:
         // See if any parents need this value.
-        if (((SPObjectClass *) fePointLight_parent_class)->set) {
-            ((SPObjectClass *) fePointLight_parent_class)->set(object, key, value);
+        if (((SPObjectClass *) sp_fepointlight_parent_class)->set) {
+            ((SPObjectClass *) sp_fepointlight_parent_class)->set(object, key, value);
         }
         break;
     }
@@ -215,8 +187,8 @@ sp_fepointlight_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "z" );
     }
 
-    if (((SPObjectClass *) fePointLight_parent_class)->update) {
-        ((SPObjectClass *) fePointLight_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_fepointlight_parent_class)->update) {
+        ((SPObjectClass *) sp_fepointlight_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -239,8 +211,8 @@ sp_fepointlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::
     if (fepointlight->z_set)
         sp_repr_set_css_double(repr, "z", fepointlight->z);
 
-    if (((SPObjectClass *) fePointLight_parent_class)->write) {
-        ((SPObjectClass *) fePointLight_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_fepointlight_parent_class)->write) {
+        ((SPObjectClass *) sp_fepointlight_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp
index 71a705c94..44eeff35a 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -31,10 +31,6 @@
 #include "display/nr-filter-specularlighting.h"
 
 /* FeSpecularLighting base class */
-
-static void sp_feSpecularLighting_class_init(SPFeSpecularLightingClass *klass);
-static void sp_feSpecularLighting_init(SPFeSpecularLighting *feSpecularLighting);
-
 static void sp_feSpecularLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feSpecularLighting_release(SPObject *object);
 static void sp_feSpecularLighting_set(SPObject *object, unsigned int key, gchar const *value);
@@ -52,35 +48,13 @@ static Inkscape::XML::Node *sp_feSpecularLighting_write(SPObject *object, Inksca
 static void sp_feSpecularLighting_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 static void sp_feSpecularLighting_children_modified(SPFeSpecularLighting *sp_specularlighting);
 
-static SPFilterPrimitiveClass *feSpecularLighting_parent_class;
-
-GType
-sp_feSpecularLighting_get_type()
-{
-    static GType feSpecularLighting_type = 0;
-
-    if (!feSpecularLighting_type) {
-        GTypeInfo feSpecularLighting_info = {
-            sizeof(SPFeSpecularLightingClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feSpecularLighting_class_init,
-            NULL, NULL,
-            sizeof(SPFeSpecularLighting),
-            16,
-            (GInstanceInitFunc) sp_feSpecularLighting_init,
-            NULL,    /* value_table */
-        };
-        feSpecularLighting_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeSpecularLighting", &feSpecularLighting_info, (GTypeFlags)0);
-    }
-    return feSpecularLighting_type;
-}
+G_DEFINE_TYPE(SPFeSpecularLighting, sp_feSpecularLighting, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feSpecularLighting_class_init(SPFeSpecularLightingClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
-    feSpecularLighting_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
 
     sp_object_class->build = sp_feSpecularLighting_build;
     sp_object_class->release = sp_feSpecularLighting_release;
@@ -118,8 +92,8 @@ sp_feSpecularLighting_init(SPFeSpecularLighting *feSpecularLighting)
 static void
 sp_feSpecularLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feSpecularLighting_parent_class)->build) {
-        ((SPObjectClass *) feSpecularLighting_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feSpecularLighting_parent_class)->build) {
+        ((SPObjectClass *) sp_feSpecularLighting_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -137,8 +111,8 @@ sp_feSpecularLighting_build(SPObject *object, SPDocument *document, Inkscape::XM
 static void
 sp_feSpecularLighting_release(SPObject *object)
 {
-    if (((SPObjectClass *) feSpecularLighting_parent_class)->release)
-        ((SPObjectClass *) feSpecularLighting_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feSpecularLighting_parent_class)->release)
+        ((SPObjectClass *) sp_feSpecularLighting_parent_class)->release(object);
 }
 
 /**
@@ -239,8 +213,8 @@ sp_feSpecularLighting_set(SPObject *object, unsigned int key, gchar const *value
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         default:
-            if (((SPObjectClass *) feSpecularLighting_parent_class)->set)
-                ((SPObjectClass *) feSpecularLighting_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feSpecularLighting_parent_class)->set)
+                ((SPObjectClass *) sp_feSpecularLighting_parent_class)->set(object, key, value);
             break;
     }
 
@@ -260,8 +234,8 @@ sp_feSpecularLighting_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "lighting-color" );
     }
 
-    if (((SPObjectClass *) feSpecularLighting_parent_class)->update) {
-        ((SPObjectClass *) feSpecularLighting_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feSpecularLighting_parent_class)->update) {
+        ((SPObjectClass *) sp_feSpecularLighting_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -292,8 +266,8 @@ sp_feSpecularLighting_write(SPObject *object, Inkscape::XML::Document *doc, Inks
         sp_svg_write_color(c, sizeof(c), fespecularlighting->lighting_color);
         repr->setAttribute("lighting-color", c);
     }
-    if (((SPObjectClass *) feSpecularLighting_parent_class)->write) {
-        ((SPObjectClass *) feSpecularLighting_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feSpecularLighting_parent_class)->write) {
+        ((SPObjectClass *) sp_feSpecularLighting_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
@@ -307,8 +281,8 @@ sp_feSpecularLighting_child_added(SPObject *object, Inkscape::XML::Node *child,
 {
     SPFeSpecularLighting *f = SP_FESPECULARLIGHTING(object);
 
-    if (((SPObjectClass *) feSpecularLighting_parent_class)->child_added)
-        (* ((SPObjectClass *) feSpecularLighting_parent_class)->child_added)(object, child, ref);
+    if (((SPObjectClass *) sp_feSpecularLighting_parent_class)->child_added)
+        (* ((SPObjectClass *) sp_feSpecularLighting_parent_class)->child_added)(object, child, ref);
 
     sp_feSpecularLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -323,8 +297,8 @@ sp_feSpecularLighting_remove_child(SPObject *object, Inkscape::XML::Node *child)
 {   
     SPFeSpecularLighting *f = SP_FESPECULARLIGHTING(object);
 
-    if (((SPObjectClass *) feSpecularLighting_parent_class)->remove_child)
-        (* ((SPObjectClass *) feSpecularLighting_parent_class)->remove_child)(object, child);   
+    if (((SPObjectClass *) sp_feSpecularLighting_parent_class)->remove_child)
+        (* ((SPObjectClass *) sp_feSpecularLighting_parent_class)->remove_child)(object, child);   
 
     sp_feSpecularLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -334,8 +308,8 @@ static void
 sp_feSpecularLighting_order_changed (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref)
 {
     SPFeSpecularLighting *f = SP_FESPECULARLIGHTING(object);
-    if (((SPObjectClass *) (feSpecularLighting_parent_class))->order_changed)
-        (* ((SPObjectClass *) (feSpecularLighting_parent_class))->order_changed) (object, child, old_ref, new_ref);
+    if (((SPObjectClass *) (sp_feSpecularLighting_parent_class))->order_changed)
+        (* ((SPObjectClass *) (sp_feSpecularLighting_parent_class))->order_changed) (object, child, old_ref, new_ref);
 
     sp_feSpecularLighting_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index 7be83ed00..181e39990 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -30,47 +30,19 @@
 #include "macros.h"
 
 /* FeSpotLight class */
-
-static void sp_fespotlight_class_init(SPFeSpotLightClass *klass);
-static void sp_fespotlight_init(SPFeSpotLight *fespotlight);
-
 static void sp_fespotlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_fespotlight_release(SPObject *object);
 static void sp_fespotlight_set(SPObject *object, unsigned int key, gchar const *value);
 static void sp_fespotlight_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_fespotlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 
-static SPObjectClass *feSpotLight_parent_class;
-
-GType
-sp_fespotlight_get_type()
-{
-    static GType fespotlight_type = 0;
-
-    if (!fespotlight_type) {
-        GTypeInfo fespotlight_info = {
-            sizeof(SPFeSpotLightClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_fespotlight_class_init,
-            NULL, NULL,
-            sizeof(SPFeSpotLight),
-            16,
-            (GInstanceInitFunc) sp_fespotlight_init,
-            NULL,    /* value_table */
-        };
-        fespotlight_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeSpotLight", &fespotlight_info, (GTypeFlags)0);
-    }
-    return fespotlight_type;
-}
+G_DEFINE_TYPE(SPFeSpotLight, sp_fespotlight, SP_TYPE_OBJECT);
 
 static void
 sp_fespotlight_class_init(SPFeSpotLightClass *klass)
 {
-
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
 
-    feSpotLight_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_fespotlight_build;
     sp_object_class->release = sp_fespotlight_release;
     sp_object_class->write = sp_fespotlight_write;
@@ -108,8 +80,8 @@ sp_fespotlight_init(SPFeSpotLight *fespotlight)
 static void
 sp_fespotlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feSpotLight_parent_class)->build) {
-        ((SPObjectClass *) feSpotLight_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_fespotlight_parent_class)->build) {
+        ((SPObjectClass *) sp_fespotlight_parent_class)->build(object, document, repr);
     }
 
     //Read values of key attributes from XML nodes into object.
@@ -290,8 +262,8 @@ sp_fespotlight_set(SPObject *object, unsigned int key, gchar const *value)
         break;
     default:
         // See if any parents need this value.
-        if (((SPObjectClass *) feSpotLight_parent_class)->set) {
-            ((SPObjectClass *) feSpotLight_parent_class)->set(object, key, value);
+        if (((SPObjectClass *) sp_fespotlight_parent_class)->set) {
+            ((SPObjectClass *) sp_fespotlight_parent_class)->set(object, key, value);
         }
         break;
     }
@@ -318,8 +290,8 @@ sp_fespotlight_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "limitingConeAngle" );
     }
 
-    if (((SPObjectClass *) feSpotLight_parent_class)->update) {
-        ((SPObjectClass *) feSpotLight_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_fespotlight_parent_class)->update) {
+        ((SPObjectClass *) sp_fespotlight_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -352,8 +324,8 @@ sp_fespotlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::X
     if (fespotlight->limitingConeAngle_set)
         sp_repr_set_css_double(repr, "limitingConeAngle", fespotlight->limitingConeAngle);
 
-    if (((SPObjectClass *) feSpotLight_parent_class)->write) {
-        ((SPObjectClass *) feSpotLight_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_fespotlight_parent_class)->write) {
+        ((SPObjectClass *) sp_fespotlight_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/tile.cpp b/src/filters/tile.cpp
index 42a59ede8..d2725f50c 100644
--- a/src/filters/tile.cpp
+++ b/src/filters/tile.cpp
@@ -23,10 +23,6 @@
 #include "display/nr-filter-tile.h"
 
 /* FeTile base class */
-
-static void sp_feTile_class_init(SPFeTileClass *klass);
-static void sp_feTile_init(SPFeTile *feTile);
-
 static void sp_feTile_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feTile_release(SPObject *object);
 static void sp_feTile_set(SPObject *object, unsigned int key, gchar const *value);
@@ -34,28 +30,7 @@ static void sp_feTile_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feTile_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feTile_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feTile_parent_class;
-
-GType
-sp_feTile_get_type()
-{
-    static GType feTile_type = 0;
-
-    if (!feTile_type) {
-        GTypeInfo feTile_info = {
-            sizeof(SPFeTileClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feTile_class_init,
-            NULL, NULL,
-            sizeof(SPFeTile),
-            16,
-            (GInstanceInitFunc) sp_feTile_init,
-            NULL,    /* value_table */
-        };
-        feTile_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeTile", &feTile_info, (GTypeFlags)0);
-    }
-    return feTile_type;
-}
+G_DEFINE_TYPE(SPFeTile, sp_feTile, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feTile_class_init(SPFeTileClass *klass)
@@ -63,8 +38,6 @@ sp_feTile_class_init(SPFeTileClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feTile_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feTile_build;
     sp_object_class->release = sp_feTile_release;
     sp_object_class->write = sp_feTile_write;
@@ -86,8 +59,8 @@ sp_feTile_init(SPFeTile */*feTile*/)
 static void
 sp_feTile_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feTile_parent_class)->build) {
-        ((SPObjectClass *) feTile_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feTile_parent_class)->build) {
+        ((SPObjectClass *) sp_feTile_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -99,8 +72,8 @@ sp_feTile_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *rep
 static void
 sp_feTile_release(SPObject *object)
 {
-    if (((SPObjectClass *) feTile_parent_class)->release)
-        ((SPObjectClass *) feTile_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feTile_parent_class)->release)
+        ((SPObjectClass *) sp_feTile_parent_class)->release(object);
 }
 
 /**
@@ -115,8 +88,8 @@ sp_feTile_set(SPObject *object, unsigned int key, gchar const *value)
     switch(key) {
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
-            if (((SPObjectClass *) feTile_parent_class)->set)
-                ((SPObjectClass *) feTile_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feTile_parent_class)->set)
+                ((SPObjectClass *) sp_feTile_parent_class)->set(object, key, value);
             break;
     }
 
@@ -135,8 +108,8 @@ sp_feTile_update(SPObject *object, SPCtx *ctx, guint flags)
 
     }
 
-    if (((SPObjectClass *) feTile_parent_class)->update) {
-        ((SPObjectClass *) feTile_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feTile_parent_class)->update) {
+        ((SPObjectClass *) sp_feTile_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -152,8 +125,8 @@ sp_feTile_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::N
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) feTile_parent_class)->write) {
-        ((SPObjectClass *) feTile_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feTile_parent_class)->write) {
+        ((SPObjectClass *) sp_feTile_parent_class)->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index 9d1448c70..c4d4ca4ae 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -29,10 +29,6 @@
 #include "display/nr-filter-turbulence.h"
 
 /* FeTurbulence base class */
-
-static void sp_feTurbulence_class_init(SPFeTurbulenceClass *klass);
-static void sp_feTurbulence_init(SPFeTurbulence *feTurbulence);
-
 static void sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
 static void sp_feTurbulence_release(SPObject *object);
 static void sp_feTurbulence_set(SPObject *object, unsigned int key, gchar const *value);
@@ -40,28 +36,7 @@ static void sp_feTurbulence_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feTurbulence_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 static void sp_feTurbulence_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
 
-static SPFilterPrimitiveClass *feTurbulence_parent_class;
-
-GType
-sp_feTurbulence_get_type()
-{
-    static GType feTurbulence_type = 0;
-
-    if (!feTurbulence_type) {
-        GTypeInfo feTurbulence_info = {
-            sizeof(SPFeTurbulenceClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_feTurbulence_class_init,
-            NULL, NULL,
-            sizeof(SPFeTurbulence),
-            16,
-            (GInstanceInitFunc) sp_feTurbulence_init,
-            NULL,    /* value_table */
-        };
-        feTurbulence_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeTurbulence", &feTurbulence_info, (GTypeFlags)0);
-    }
-    return feTurbulence_type;
-}
+G_DEFINE_TYPE(SPFeTurbulence, sp_feTurbulence, SP_TYPE_FILTER_PRIMITIVE);
 
 static void
 sp_feTurbulence_class_init(SPFeTurbulenceClass *klass)
@@ -69,8 +44,6 @@ sp_feTurbulence_class_init(SPFeTurbulenceClass *klass)
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
     SPFilterPrimitiveClass * sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feTurbulence_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
-
     sp_object_class->build = sp_feTurbulence_build;
     sp_object_class->release = sp_feTurbulence_release;
     sp_object_class->write = sp_feTurbulence_write;
@@ -94,8 +67,8 @@ sp_feTurbulence_init(SPFeTurbulence *feTurbulence)
 static void
 sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) feTurbulence_parent_class)->build) {
-        ((SPObjectClass *) feTurbulence_parent_class)->build(object, document, repr);
+    if (((SPObjectClass *) sp_feTurbulence_parent_class)->build) {
+        ((SPObjectClass *) sp_feTurbulence_parent_class)->build(object, document, repr);
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
@@ -112,8 +85,8 @@ sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
 static void
 sp_feTurbulence_release(SPObject *object)
 {
-    if (((SPObjectClass *) feTurbulence_parent_class)->release)
-        ((SPObjectClass *) feTurbulence_parent_class)->release(object);
+    if (((SPObjectClass *) sp_feTurbulence_parent_class)->release)
+        ((SPObjectClass *) sp_feTurbulence_parent_class)->release(object);
 }
 
 static bool sp_feTurbulence_read_stitchTiles(gchar const *value){
@@ -200,8 +173,8 @@ sp_feTurbulence_set(SPObject *object, unsigned int key, gchar const *value)
             }
             break;
         default:
-            if (((SPObjectClass *) feTurbulence_parent_class)->set)
-                ((SPObjectClass *) feTurbulence_parent_class)->set(object, key, value);
+            if (((SPObjectClass *) sp_feTurbulence_parent_class)->set)
+                ((SPObjectClass *) sp_feTurbulence_parent_class)->set(object, key, value);
             break;
     }
 
@@ -220,8 +193,8 @@ sp_feTurbulence_update(SPObject *object, SPCtx *ctx, guint flags)
 
     }
 
-    if (((SPObjectClass *) feTurbulence_parent_class)->update) {
-        ((SPObjectClass *) feTurbulence_parent_class)->update(object, ctx, flags);
+    if (((SPObjectClass *) sp_feTurbulence_parent_class)->update) {
+        ((SPObjectClass *) sp_feTurbulence_parent_class)->update(object, ctx, flags);
     }
 }
 
@@ -237,8 +210,8 @@ sp_feTurbulence_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) feTurbulence_parent_class)->write) {
-        ((SPObjectClass *) feTurbulence_parent_class)->write(object, doc, repr, flags);
+    if (((SPObjectClass *) sp_feTurbulence_parent_class)->write) {
+        ((SPObjectClass *) sp_feTurbulence_parent_class)->write(object, doc, repr, flags);
     }
 
     /* turbulence doesn't take input */