diff --git a/ChangeLog b/ChangeLog
index 33fa896751..eea11e3060 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c: Fix doc comment. 
+
+	* gdk/gdkdnd.c: Add missing includes.
+
 2002-10-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkdnd.c: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 33fa896751..eea11e3060 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-10-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c: Fix doc comment. 
+
+	* gdk/gdkdnd.c: Add missing includes.
+
 2002-10-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkdnd.c: 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 33fa896751..eea11e3060 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-10-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c: Fix doc comment. 
+
+	* gdk/gdkdnd.c: Add missing includes.
+
 2002-10-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkdnd.c: 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 33fa896751..eea11e3060 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-10-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c: Fix doc comment. 
+
+	* gdk/gdkdnd.c: Add missing includes.
+
 2002-10-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkdnd.c: 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 33fa896751..eea11e3060 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-10-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c: Fix doc comment. 
+
+	* gdk/gdkdnd.c: Add missing includes.
+
 2002-10-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkdnd.c: 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 33fa896751..eea11e3060 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-10-25  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkcursor-x11.c: Fix doc comment. 
+
+	* gdk/gdkdnd.c: Add missing includes.
+
 2002-10-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkdnd.c: 
diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 00117119b6..3ee8ad4338 100644
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -25,6 +25,8 @@
  */
 
 #include <gdkdnd.h>
+#include <gdkdrawable.h>
+#include <gdkdisplay.h>
 
 /**
  * gdk_drag_find_window:
@@ -73,3 +75,6 @@ gdk_drag_get_protocol (guint32          xid,
   return gdk_drag_get_protocol_for_display (gdk_display_get_default (), xid, protocol);
 }
 
+
+
+
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index 7cc0b8b6a1..98f1a8db0b 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -704,22 +704,6 @@ make_list (const gchar  *text,
   return n_strings;
 }
 
-/**
- * gdk_text_property_to_utf8_list_for_display:
- * @display:  currently ignored
- * @encoding: an atom representing the encoding of the text
- * @format:   the format of the property
- * @text:     the text to convert
- * @length:   the length of @text, in bytes
- * @list:     location to store the list of strings or %NULL. The
- *            list should be freed with g_strfreev().
- * 
- * Converts a text property in the giving encoding to
- * a list of UTF-8 strings. 
- * 
- * Return value: the number of strings in the resulting
- *               list.
- **/
 gint 
 gdk_text_property_to_utf8_list_for_display (GdkDisplay    *display,
                                             GdkAtom        encoding,
@@ -841,40 +825,12 @@ sanitize_utf8 (const gchar *src)
   return g_string_free (result, FALSE);
 }
 
-/**
- * gdk_utf8_to_string_target:
- * @str: a UTF-8 string
- * 
- * Converts an UTF-8 string into the best possible representation
- * as a STRING. The representation of characters not in STRING
- * is not specified; it may be as pseudo-escape sequences
- * \x{ABCD}, or it may be in some other form of approximation.
- * 
- * Return value: the newly allocated string, or %NULL if the
- *               conversion failed. (It should not fail for
- *               any properly formed UTF-8 string.)
- **/
 gchar *
 gdk_utf8_to_string_target (const gchar *str)
 {
   return sanitize_utf8 (str);
 }
 
-/**
- * gdk_utf8_to_compound_text_for_display :
- * @display: currently not used on win32
- * @str:      a UTF-8 string
- * @encoding: location to store resulting encoding
- * @format:   location to store format of the result
- * @ctext:    location to store the data of the result
- * @length:   location to store the length of the data
- *            stored in @ctext
- * 
- * Converts from UTF-8 to compound text. 
- * 
- * Return value: %TRUE if the conversion succeeded, otherwise
- *               %FALSE.
- **/
 gboolean
 gdk_utf8_to_compound_text_for_display (GdkDisplay *display,
                                        const gchar *str,
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 4a3dee082e..3eeddea74e 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -143,7 +143,7 @@ gdk_cursor_new_for_display (GdkDisplay    *display,
  * 
  * <example><title>Creating a custom cursor.</title>
  * <programlisting>
- * /* This data is in X bitmap format, and can be created with the 'bitmap'
+ * /<!-- -->* This data is in X bitmap format, and can be created with the 'bitmap'
  *    utility. *<!-- -->/
  * &num;define cursor1_width 16
  * &num;define cursor1_height 16
@@ -160,8 +160,8 @@ gdk_cursor_new_for_display (GdkDisplay    *display,
  *
  *  GdkCursor *cursor;
  *  GdkPixmap *source, *mask;
- *  GdkColor fg = { 0, 65535, 0, 0 }; /* Red. *<!-- -->/
- *  GdkColor bg = { 0, 0, 0, 65535 }; /* Blue. *<!-- -->/
+ *  GdkColor fg = { 0, 65535, 0, 0 }; /<!-- -->* Red. *<!-- -->/
+ *  GdkColor bg = { 0, 0, 0, 65535 }; /<!-- -->* Blue. *<!-- -->/
  *
  *
  *  source = gdk_bitmap_create_from_data (NULL, cursor1_bits,