@@ -18,18 +18,14 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/OFObject.h>
+#import <ObjFW/ObjFW.h>
 
-@class OFString;
-@class OFMutableDictionary;
-@class OFTCPSocket;
 @class IRCConnection;
 @class IRCUser;
-@class IRCChannel;
 
 #ifndef IRC_CONNECTION_M
 @protocol IRCConnectionDelegate <OFObject>
 #else
 @protocol IRCConnectionDelegate
@@ -42,42 +38,42 @@
 - (void)connection: (IRCConnection*)connection
        didSendLine: (OFString*)line;
 - (void)connectionWasEstablished: (IRCConnection*)connection;
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
-       joinChannel: (IRCChannel*)channel;
+       joinChannel: (OFString*)channel;
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
-      leaveChannel: (IRCChannel*)channel
+      leaveChannel: (OFString*)channel
 	    reason: (OFString*)reason;
 - (void)connection: (IRCConnection*)connection
         didSeeUser: (IRCUser*)user
   changeNicknameTo: (OFString*)nickname;
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
 	  kickUser: (OFString*)kickedUser
-	   channel: (IRCChannel*)channel
+	   channel: (OFString*)channel
 	    reason: (OFString*)reason;
 - (void)connection: (IRCConnection*)connection
     didSeeUserQuit: (IRCUser*)user
 	    reason: (OFString*)reason;
 -  (void)connection: (IRCConnection*)connection
   didReceiveMessage: (OFString*)msg
-	       user: (IRCUser*)user
-	    channel: (IRCChannel*)channel;
+	    channel: (OFString*)channel
+	       user: (IRCUser*)user;
 -	  (void)connection: (IRCConnection*)connection
   didReceivePrivateMessage: (OFString*)msg
 		      user: (IRCUser*)user;
 - (void)connection: (IRCConnection*)connection
   didReceiveNotice: (OFString*)notice
 	      user: (IRCUser*)user;
 - (void)connection: (IRCConnection*)connection
   didReceiveNotice: (OFString*)notice
-	      user: (IRCUser*)user
-	   channel: (IRCChannel*)channel;
+	   channel: (OFString*)channel
+	      user: (IRCUser*)user;
 -	   (void)connection: (IRCConnection*)connection
-  didReceiveNamesForChannel: (IRCChannel*)channel;
+  didReceiveNamesForChannel: (OFString*)channel;
 - (void)connectionWasClosed: (IRCConnection*)connection;
 @end
 
 @interface IRCConnection: OFObject
 {
@@ -114,26 +110,23 @@
 - (void)sendLineWithFormat: (OFConstantString*)line, ...;
 - (void)connect;
 - (void)disconnect;
 - (void)disconnectWithReason: (OFString*)reason;
 - (void)joinChannel: (OFString*)channelName;
-- (void)leaveChannel: (IRCChannel*)channel;
-- (void)leaveChannel: (IRCChannel*)channel
+- (void)leaveChannel: (OFString*)channel;
+- (void)leaveChannel: (OFString*)channel
 	      reason: (OFString*)reason;
 - (void)sendMessage: (OFString*)msg
-	    channel: (IRCChannel*)channel;
-- (void)sendMessage: (OFString*)msg
-	       user: (OFString*)user;
-- (void)sendNotice: (OFString*)notice
-	      user: (OFString*)user;
-- (void)sendNotice: (OFString*)notice
-	   channel: (IRCChannel*)channel;
-- (void)kickUser: (OFString*)user
-	 channel: (IRCChannel*)channel
+		 to: (OFString*)to;
+- (void)sendNotice: (OFString*)notice
+		to: (OFString*)to;
+- (void)kickUser: (OFString*)user
+	 channel: (OFString*)channel
 	  reason: (OFString*)reason;
 - (void)changeNicknameTo: (OFString*)nickname;
 - (void)processLine: (OFString*)line;
 - (void)handleConnection;
+- (OFSet*)usersInChannel: (OFString*)channel;
 @end
 
 @interface OFObject (IRCConnectionDelegate) <IRCConnectionDelegate>
 @end