Index: src/XMPPConnection.h
==================================================================
--- src/XMPPConnection.h
+++ src/XMPPConnection.h
@@ -358,10 +358,11 @@
 - (void)setDataStorage: (id <XMPPStorage>)dataStorage;
 - (id <XMPPStorage>)dataStorage;
 - (void)setLanguage: (OFString*)language;
 - (OFString*)language;
 - (BOOL)supportsRosterVersioning;
+- (BOOL)supportsStreamManagement;
 
 /// \cond internal
 - (void)XMPP_startStream;
 - (void)XMPP_handleStream: (OFXMLElement*)element;
 - (void)XMPP_handleTLS: (OFXMLElement*)element;
@@ -382,5 +383,8 @@
 				     IQ: (XMPPIQ*)iq;
 - (OFString*)XMPP_IDNAToASCII: (OFString*)domain;
 - (XMPPMulticastDelegate*)XMPP_delegates;
 /// \endcond
 @end
+
+@interface OFObject (XMPPConnectionDelegate) <XMPPConnectionDelegate>
+@end

Index: src/XMPPContactManager.m
==================================================================
--- src/XMPPContactManager.m
+++ src/XMPPContactManager.m
@@ -56,16 +56,16 @@
 	[_contacts release];
 
 	[super dealloc];
 }
 
-- (void)addDelegate: (id <XMPPConnectionDelegate>)delegate
+- (void)addDelegate: (id <XMPPContactManagerDelegate>)delegate
 {
 	[_delegates addDelegate: delegate];
 }
 
-- (void)removeDelegate: (id <XMPPConnectionDelegate>)delegate
+- (void)removeDelegate: (id <XMPPContactManagerDelegate>)delegate
 {
 	[_delegates removeDelegate: delegate];
 }
 
 - (OFDictionary*)contacts

Index: src/XMPPRoster.h
==================================================================
--- src/XMPPRoster.h
+++ src/XMPPRoster.h
@@ -158,5 +158,8 @@
 - (void)XMPP_handleInitialRosterForConnection: (XMPPConnection*)connection
 					   IQ: (XMPPIQ*)iq;
 - (XMPPRosterItem*)XMPP_rosterItemWithXMLElement: (OFXMLElement*)element;
 /// \endcond
 @end
+
+@interface OFObject (XMPPRosterDelegate) <XMPPRosterDelegate>
+@end

Index: src/XMPPStreamManagement.m
==================================================================
--- src/XMPPStreamManagement.m
+++ src/XMPPStreamManagement.m
@@ -88,14 +88,14 @@
     didSendElement: (OFXMLElement*)element
 {
 }
 */
 
-- (void)connection: (XMPPConnection*)connection_
-     wasBoundToJID: (XMPPJID*)jid
+- (void)connection: (XMPPConnection*)connection
+     wasBoundToJID: (XMPPJID*)JID
 {
-	if ([connection_ supportsStreamManagement])
-		[connection_ sendStanza:
+	if ([connection supportsStreamManagement])
+		[connection sendStanza:
 		    [OFXMLElement elementWithName: @"enable"
 					namespace: XMPP_NS_SM]];
 }
 @end