diff --git a/ChangeLog b/ChangeLog
index 5620283b2..cfbbe8bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-07  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-model-default.[ch]: Remove the ClutterModelDefault
+	iterator symbols from the public API; the iterator implementation
+	is a detail of the default ClutterModel class
+
+	* clutter.symbols: Update
+
 2008-01-07  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-model.h:
diff --git a/clutter.symbols b/clutter.symbols
index 4b6222039..5448a8fcf 100644
--- a/clutter.symbols
+++ b/clutter.symbols
@@ -373,6 +373,9 @@ clutter_media_get_uri
 clutter_media_get_volume
 clutter_model_append
 clutter_model_appendv
+clutter_model_default_get_type
+clutter_model_default_new
+clutter_model_default_newv
 clutter_model_foreach
 clutter_model_get_column_name
 clutter_model_get_column_type
@@ -398,8 +401,6 @@ clutter_model_iter_prev
 clutter_model_iter_set
 clutter_model_iter_set_valist
 clutter_model_iter_set_value
-clutter_model_new
-clutter_model_newv
 clutter_model_prepend
 clutter_model_prependv
 clutter_model_set_filter
diff --git a/clutter/clutter-model-default.c b/clutter/clutter-model-default.c
index 019752b7d..bbe745511 100644
--- a/clutter/clutter-model-default.c
+++ b/clutter/clutter-model-default.c
@@ -54,6 +54,15 @@
 #include "clutter-private.h"
 #include "clutter-debug.h"
 
+#define CLUTTER_TYPE_MODEL_DEFAULT_ITER                 \
+        (clutter_model_default_iter_get_type())
+#define CLUTTER_MODEL_DEFAULT_ITER(obj)                 \
+        (G_TYPE_CHECK_INSTANCE_CAST((obj),              \
+         CLUTTER_TYPE_MODEL_DEFAULT_ITER,               \
+         ClutterModelDefaultIter))
+#define CLUTTER_IS_MODEL_DEFAULT_ITER(obj)              \
+        (G_TYPE_CHECK_INSTANCE_TYPE((obj),              \
+         CLUTTER_TYPE_MODEL_DEFAULT_ITER))
 #define CLUTTER_MODEL_DEFAULT_ITER_CLASS(klass)         \
         (G_TYPE_CHECK_CLASS_CAST ((klass),              \
          CLUTTER_TYPE_MODEL_DEFAULT_ITER,               \
@@ -78,7 +87,9 @@
          CLUTTER_TYPE_MODEL_DEFAULT,                    \
          ClutterModelDefaultClass))
 
+typedef struct _ClutterModelDefaultIter ClutterModelDefaultIter;
 typedef struct _ClutterModelIterClass   ClutterModelDefaultIterClass;
+
 typedef struct _ClutterModelClass       ClutterModelDefaultClass;
 
 struct _ClutterModelDefault
diff --git a/clutter/clutter-model-default.h b/clutter/clutter-model-default.h
index f469c6b69..f9f426317 100644
--- a/clutter/clutter-model-default.h
+++ b/clutter/clutter-model-default.h
@@ -34,25 +34,19 @@
 
 G_BEGIN_DECLS
 
-#define CLUTTER_TYPE_MODEL_DEFAULT_ITER         (clutter_model_default_iter_get_type ())
-#define CLUTTER_MODEL_DEFAULT_ITER(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_MODEL_DEFAULT_ITER, ClutterModelDefaultIter))
-#define CLUTTER_IS_MODEL_DEFAULT_ITER(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_MODEL_DEFAULT_ITER))
-
 #define CLUTTER_TYPE_MODEL_DEFAULT              (clutter_model_default_get_type ())
 #define CLUTTER_MODEL_DEFAULT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_MODEL_DEFAULT, ClutterModelDefault))
 #define CLUTTER_IS_MODEL_DEFAULT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_MODEL_DEFAULT))
 
-typedef struct _ClutterModelDefaultIter ClutterModelDefaultIter;
 typedef struct _ClutterModelDefault     ClutterModelDefault;
 
-GType clutter_model_default_iter_get_type (void) G_GNUC_CONST;
-GType clutter_model_default_get_type      (void) G_GNUC_CONST;
+GType         clutter_model_default_get_type (void) G_GNUC_CONST;
 
-ClutterModel *clutter_model_default_new  (guint                n_columns,
-                                          ...);
-ClutterModel *clutter_model_default_newv (guint                n_columns,
-                                          GType               *types,
-                                          const gchar * const  names[]);
+ClutterModel *clutter_model_default_new      (guint                n_columns,
+                                              ...);
+ClutterModel *clutter_model_default_newv     (guint                n_columns,
+                                              GType               *types,
+                                              const gchar * const  names[]);
 
 G_END_DECLS
 
diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 18ce3897b..826a709af 100644
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-07  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter-sections.txt: Remove symbols of the ClutterModelDefault
+	iterator class.
+
 2008-01-07  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter-sections.txt: Remove clutter_model_append_value()
diff --git a/doc/reference/clutter-sections.txt b/doc/reference/clutter-sections.txt
index 550594cdc..a4fc18152 100644
--- a/doc/reference/clutter-sections.txt
+++ b/doc/reference/clutter-sections.txt
@@ -1236,19 +1236,14 @@ clutter_model_iter_get_type
 <FILE>clutter-model-default</FILE>
 <TITLE>ClutterModelDefault</TITLE>
 ClutterModelDefault
-ClutterModelDefaultIter
 clutter_model_default_new
 clutter_model_default_newv
 <SUBSECTION Standard>
 CLUTTER_TYPE_MODEL_DEFAULT
-CLUTTER_TYPE_MODEL_DEFAULT_ITER
 CLUTTER_MODEL_DEFAULT
-CLUTTER_MODEL_DEFAULT_ITER
 CLUTTER_IS_MODEL_DEFAULT
-CLUTTER_IS_MODEL_DEFAULT_ITER
 <SUBSECTION Private>
 clutter_model_default_get_type
-clutter_model_default_iter_get_type
 </SECTION>
 
 <SECTION>