diff --git a/src/perl/common/Channel.xs b/src/perl/common/Channel.xs
index 2a248060..f07f2049 100644
--- a/src/perl/common/Channel.xs
+++ b/src/perl/common/Channel.xs
@@ -17,14 +17,6 @@ CODE:
 OUTPUT:
 	RETVAL
 
-Irssi::Channel
-channel_create(chat_type, name, automatic)
-	int chat_type
-	char *name
-	int automatic
-CODE:
-	channel_create(chat_type, NULL, name, automatic);
-
 #*******************************
 MODULE = Irssi  PACKAGE = Irssi::Server
 #*******************************
diff --git a/src/perl/common/Log.xs b/src/perl/common/Log.xs
index 3418555b..43ebad3c 100644
--- a/src/perl/common/Log.xs
+++ b/src/perl/common/Log.xs
@@ -25,11 +25,11 @@ MODULE = Irssi  PACKAGE = Irssi::Log  PREFIX = log_
 #*******************************
 
 void
-log_item_add(log, type, name, server)
+log_item_add(log, type, name, servertag)
 	Irssi::Log log
 	int type
 	char *name
-	Irssi::Server server
+	char *servertag
 
 void
 log_item_destroy(log, item)
@@ -37,11 +37,11 @@ log_item_destroy(log, item)
 	Irssi::Logitem item
 
 Irssi::Logitem
-log_item_find(log, type, item, server)
+log_item_find(log, type, item, servertag)
 	Irssi::Log log
 	int type
 	char *item
-	Irssi::Server server
+	char *servertag
 
 void
 log_update(log)
diff --git a/src/perl/common/Query.xs b/src/perl/common/Query.xs
index 139bd88b..191b334a 100644
--- a/src/perl/common/Query.xs
+++ b/src/perl/common/Query.xs
@@ -11,13 +11,6 @@ PPCODE:
 		XPUSHs(sv_2mortal(irssi_bless(rec)));
 	}
 
-Irssi::Query
-query_create(chat_type, server_tag, nick, automatic)
-	int chat_type
-	char *server_tag
-	char *nick
-	int automatic
-
 Irssi::Query
 query_find(nick)
 	char *nick
diff --git a/src/perl/common/Server.xs b/src/perl/common/Server.xs
index 7454aa8f..fc28710c 100644
--- a/src/perl/common/Server.xs
+++ b/src/perl/common/Server.xs
@@ -21,7 +21,8 @@ PPCODE:
 	}
 
 Irssi::Connect
-server_create_conn(dest, port=6667, password=NULL, nick=NULL)
+server_create_conn(chat_type, dest, port=6667, password=NULL, nick=NULL)
+	int chat_type
 	char *dest
 	int port
 	char *password