diff --git a/ChangeLog b/ChangeLog
index ac139f3..6ebd078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-06  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/x11/xdnd.h: Declare two more functions used in xpbs.m.
+	* Tools/gpbs.m: Removed compiler warnings about mismatching declarations.
+
 2006-01-29  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/cairo/CairoFontInfo.m (_cairo_extents_for_NSGlyph,
diff --git a/Headers/x11/xdnd.h b/Headers/x11/xdnd.h
index 528a143..20d94e4 100644
--- a/Headers/x11/xdnd.h
+++ b/Headers/x11/xdnd.h
@@ -120,6 +120,7 @@ void xdnd_init (DndClass * dnd, Display * display);
 void xdnd_set_dnd_aware (DndClass * dnd, Window window, Atom * typelist);
 int xdnd_is_dnd_aware (DndClass * dnd, Window window, int *version, Atom * typelist);
 void xdnd_set_type_list (DndClass * dnd, Window window, Atom * typelist);
+void xdnd_get_type_list (DndClass * dnd, Window window, Atom ** typelist);
 void xdnd_send_enter (DndClass * dnd, Window window, Window from, Atom * typelist);
 void xdnd_send_position (DndClass * dnd, Window window, Window from, Atom action, int x, int y, unsigned long etime);
 void xdnd_send_status (DndClass * dnd, Window window, Window from, int will_accept,
@@ -128,6 +129,7 @@ void xdnd_send_leave (DndClass * dnd, Window window, Window from);
 void xdnd_send_drop (DndClass * dnd, Window window, Window from, unsigned long etime);
 void xdnd_send_finished (DndClass * dnd, Window window, Window from, int error);
 int xdnd_convert_selection (DndClass * dnd, Window window, Window requester, Atom type);
+int xdnd_set_selection_owner (DndClass * dnd, Window window, Atom type);
 void xdnd_selection_send (DndClass * dnd, XSelectionRequestEvent * request, unsigned char *data, int length);
 
 #endif 	/* !_X_DND_H */
diff --git a/Tools/gpbs.m b/Tools/gpbs.m
index e7d2af9..e3f96b8 100644
--- a/Tools/gpbs.m
+++ b/Tools/gpbs.m
@@ -274,7 +274,7 @@ NSMutableDictionary	*pasteboards = nil;
   ASSIGN(data, d);
 }
 
-- (id) type
+- (NSString*) type
 {
   return type;
 }
@@ -367,7 +367,9 @@ NSMutableDictionary	*pasteboards = nil;
   return e;
 }
 
-- (void) addTypes: newTypes owner: newOwner pasteboard: pb
+- (void) addTypes: (NSArray*)newTypes 
+	    owner: (id)newOwner 
+       pasteboard: (id)pb
 {
   int	i;
   BOOL	wants = NO;
@@ -575,7 +577,7 @@ NSMutableDictionary	*pasteboards = nil;
 
 - (int) addTypes: (NSArray*)types
 	   owner: (id)owner
-      pasteboard: (id)pboard
+      pasteboard: (NSPasteboard*)pboard
 	oldCount: (int)count;
 - (NSString*) availableTypeFromArray: (NSArray*)types
 			 changeCount: (int*)count;
@@ -586,7 +588,7 @@ NSMutableDictionary	*pasteboards = nil;
 	  mustBeCurrent: (BOOL)flag;
 - (int) declareTypes: (NSArray*)types
 	       owner: (id)owner
-	  pasteboard: (id)pboard;
+	  pasteboard: (NSPasteboard*)pboard;
 - (PasteboardEntry*) entryByCount: (int)count;
 - (NSString*) name;
 - (void) releaseGlobally;