diff --git a/src/common.h b/src/common.h
index b5947de6..e514f279 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 55
+#define IRSSI_ABI_VERSION 56
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index 7b11a2fe..ce5f0868 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -25,7 +25,7 @@ typedef struct {
 	int cmd_queue_speed;
         int max_query_chans;
 	int starttls;
-	int no_cap : 1;
+	unsigned int no_cap : 1;
 } IRC_SERVER_SETUP_REC;
 
 void irc_servers_setup_init(void);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 01605b7d..53ff1436 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -43,7 +43,6 @@
 #define IS_IRC_SERVER_CONNECT(conn) \
 	(IRC_SERVER_CONNECT(conn) ? TRUE : FALSE)
 
-/* clang-format off */
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _IRC_SERVER_CONNECT_REC {
@@ -62,11 +61,10 @@ struct _IRC_SERVER_CONNECT_REC {
 	int max_query_chans;
 
 	int max_kicks, max_msgs, max_modes, max_whois;
-	int disallow_starttls:1;
-	int starttls:1;
-	int no_cap:1;
+	unsigned int disallow_starttls : 1;
+	unsigned int starttls : 1;
+	unsigned int no_cap : 1;
 };
-/* clang-format on */
 
 #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC
 struct _IRC_SERVER_REC {