diff --git a/src/protocol/bittorrent/common.h b/src/protocol/bittorrent/common.h
index a605cc0b..e2eb71ea 100644
--- a/src/protocol/bittorrent/common.h
+++ b/src/protocol/bittorrent/common.h
@@ -101,6 +101,7 @@ enum bittorrent_message_id {
 };
 
 typedef signed char bittorrent_message_id_T;
+typedef int bittorrent_message_id_TT;
 
 /** The peer request matches information sent in the request and cancel messages
  * in the peer-wire protocol. See the piece cache header file (cache.h) for more
diff --git a/src/protocol/bittorrent/peerwire.c b/src/protocol/bittorrent/peerwire.c
index fc3663b7..e5f7d82a 100644
--- a/src/protocol/bittorrent/peerwire.c
+++ b/src/protocol/bittorrent/peerwire.c
@@ -363,7 +363,7 @@ do_send_bittorrent_peer_message(struct bittorrent_peer_connection *peer,
  * connection struct to disappear from under us. */
 void
 send_bittorrent_peer_message(struct bittorrent_peer_connection *peer,
-			     bittorrent_message_id_T message_id, ...)
+			     bittorrent_message_id_TT message_id, ...)
 {
 	struct bittorrent_peer_request message_store, *message = &message_store;
 	va_list args;
diff --git a/src/protocol/bittorrent/peerwire.h b/src/protocol/bittorrent/peerwire.h
index 6cf281a4..5bcc8d55 100644
--- a/src/protocol/bittorrent/peerwire.h
+++ b/src/protocol/bittorrent/peerwire.h
@@ -25,7 +25,7 @@ update_bittorrent_peer_connection_stats(struct bittorrent_peer_connection *peer,
 
 void
 send_bittorrent_peer_message(struct bittorrent_peer_connection *peer,
-			     bittorrent_message_id_T message_id, ...);
+			     bittorrent_message_id_TT message_id, ...);
 
 static void inline
 set_bittorrent_peer_interested(struct bittorrent_peer_connection *peer)