diff --git a/include/mappings.h b/include/mappings.h
index 7578559..b00bd75 100644
--- a/include/mappings.h
+++ b/include/mappings.h
@@ -80,163 +80,163 @@ enum {
 #define UIRC_LCMD WHOWAS
 #endif
 };
-enum {
-	RPL_WELCOME = 1,
-	RPL_YOURHOST = 2,
-	RPL_CREATED = 3,
-	RPL_MYINFO = 4,
-	RPL_BOUNCE = 5,
+#define RPL_WELCOME 1
+#define RPL_YOURHOST 2
+#define RPL_CREATED 3
+#define RPL_MYINFO 4
+#define RPL_BOUNCE 5
 
 #ifdef UIRC_IRCV3
-	/* TO IRCv3 WG:
-	 * please, stop complicating implementations
-	 * get people in the WG that actually care about the protocol and understand why and how standards are written
-	 *
-	 * TO LIBRARY USERS:
-	 * Read the above and go speak with them, or just don't use IRCv3 :)
-	 */
-	RPL_ISUPPORT = 5,
+/* TO IRCv3 WG:
+ * please, stop complicating implementations
+ * get people in the WG that actually care about the protocol and understand why and how standards are written
+ *
+ * TO LIBRARY USERS:
+ * Read the above and go speak with them, or just don't use IRCv3 :)
+ */
+#define RPL_ISUPPORT 5
 #endif
 
-	RPL_TRACELINK = 200,
-	RPL_TRACECONNECTING = 201,
-	RPL_TRACEHANDSHAKE = 202,
-	RPL_TRACEUNKNOWN = 203,
-	RPL_TRACEOPERATOR = 204,
-	RPL_TRACEUSER = 205,
-	RPL_TRACESERVER = 206,
-	RPL_TRACENEWTYPE = 208,
-	RPL_STATSLINKINFO = 211,
-	RPL_STATSCOMMANDS = 212,
-	RPL_STATSCLINE = 213,
-	RPL_STATSNLINE = 214,
-	RPL_STATSILINE = 215,
-	RPL_STATSKLINE = 216,
-	RPL_STATSYLINE = 218,
-	RPL_ENDOFSTATS = 219,
-	RPL_UMODEIS = 221,
-	RPL_STATSLLINE = 241,
-	RPL_STATSUPTIME = 242,
-	RPL_STATSOLINE = 243,
-	RPL_STATSHLINE = 244,
-	RPL_LUSERCLIENT = 251,
-	RPL_LUSEROP = 252,
-	RPL_LUSERUNKNOWN = 253,
-	RPL_LUSERCHANNELS = 254,
-	RPL_LUSERME = 255,
-	RPL_ADMINME = 256,
-	RPL_ADMINLOC1 = 257,
-	RPL_ADMINLOC2 = 258,
-	RPL_ADMINEMAIL = 259,
-	RPL_TRACELOG = 261,
-	RPL_NONE = 300,
-	RPL_AWAY = 301,
-	RPL_USERHOST = 302,
-	RPL_ISON = 303,
-	RPL_UNAWAY = 305,
-	RPL_NOWAWAY = 306,
-	RPL_WHOISUSER = 311,
-	RPL_WHOISSERVER = 312,
-	RPL_WHOISOPERATOR = 313,
-	RPL_WHOWASUSER = 314,
-	RPL_ENDOFWHO = 315,
-	RPL_WHOISIDLE = 317,
-	RPL_ENDOFWHOIS = 318,
-	RPL_WHOISCHANNELS = 319,
-	RPL_LISTSTART = 321,
-	RPL_LIST = 322,
-	RPL_LISTEND = 323,
-	RPL_CHANNELMODEIS = 324,
-	RPL_NOTOPIC = 331,
-	RPL_TOPIC = 332,
-	RPL_INVITING = 341,
-	RPL_SUMMONING = 342,
-	RPL_VERSION = 351,
-	RPL_WHOREPLY = 352,
-	RPL_NAMREPLY = 353,
-	RPL_LINKS = 364,
-	RPL_ENDOFLINKS = 365,
-	RPL_ENDOFNAMES = 366,
-	RPL_BANLIST = 367,
-	RPL_ENDOFBANLIST = 368,
-	RPL_ENDOFWHOWAS = 369,
-	RPL_INFO = 371,
-	RPL_MOTD = 372,
-	RPL_ENDOFINFO = 374,
-	RPL_MOTDSTART = 375,
-	RPL_ENDOFMOTD = 376,
-	RPL_YOUREOPER = 381,
-	RPL_REHASHING = 382,
-	RPL_TIME = 391,
-	RPL_USERSSTART = 392,
-	RPL_USERS = 393,
-	RPL_ENDOFUSERS = 394,
-	RPL_NOUSERS = 395,
-	ERR_NOSUCHNICK = 401,
-	ERR_NOSUCHSERVER = 402,
-	ERR_NOSUCHCHANNEL = 403,
-	ERR_CANNOTSENDTOCHAN = 404,
-	ERR_TOOMANYCHANNELS = 405,
-	ERR_WASNOSUCHNICK = 406,
-	ERR_TOOMANYTARGETS = 407,
-	ERR_NOORIGIN = 409,
-	ERR_NORECIPIENT = 411,
-	ERR_NOTEXTTOSEND = 412,
-	ERR_NOTOPLEVEL = 413,
-	ERR_WILDTOPLEVEL = 414,
-	ERR_UNKNOWNCOMMAND = 421,
-	ERR_NOMOTD = 422,
-	ERR_NOADMININFO = 423,
-	ERR_FILEERROR = 424,
-	ERR_NONICKNAMEGIVEN = 431,
-	ERR_ERRONEUSNICKNAME = 432,
-	ERR_NICKNAMEINUSE = 433,
-	ERR_NICKCOLLISION = 436,
-	ERR_USERNOTINCHANNEL = 441,
-	ERR_NOTONCHANNEL = 442,
-	ERR_USERONCHANNEL = 443,
-	ERR_NOLOGIN = 444,
-	ERR_SUMMONDISABLED = 445,
-	ERR_USERSDISABLED = 446,
-	ERR_NOTREGISTERED = 451,
-	ERR_NEEDMOREPARAMS = 461,
-	ERR_ALREADYREGISTRED = 462,
-	ERR_NOPERMFORHOST = 463,
-	ERR_PASSWDMISMATCH = 464,
-	ERR_YOUREBANNEDCREEP = 465,
-	ERR_KEYSET = 467,
-	ERR_CHANNELISFULL = 471,
-	ERR_UNKNOWNMODE = 472,
-	ERR_INVITEONLYCHAN = 473,
-	ERR_BANNEDFROMCHAN = 474,
-	ERR_BADCHANNELKEY = 475,
-	ERR_NOPRIVILEGES = 481,
-	ERR_CHANOPRIVSNEEDED = 482,
-	ERR_CANTKILLSERVER = 483,
-	ERR_NOOPERHOST = 491,
-	ERR_UMODEUNKNOWNFLAG = 501,
-	ERR_USERSDONTMATCH = 502,
+#define RPL_TRACELINK 200
+#define RPL_TRACECONNECTING 201
+#define RPL_TRACEHANDSHAKE 202
+#define RPL_TRACEUNKNOWN 203
+#define RPL_TRACEOPERATOR 204
+#define RPL_TRACEUSER 205
+#define RPL_TRACESERVER 206
+#define RPL_TRACENEWTYPE 208
+#define RPL_STATSLINKINFO 211
+#define RPL_STATSCOMMANDS 212
+#define RPL_STATSCLINE 213
+#define RPL_STATSNLINE 214
+#define RPL_STATSILINE 215
+#define RPL_STATSKLINE 216
+#define RPL_STATSYLINE 218
+#define RPL_ENDOFSTATS 219
+#define RPL_UMODEIS 221
+#define RPL_STATSLLINE 241
+#define RPL_STATSUPTIME 242
+#define RPL_STATSOLINE 243
+#define RPL_STATSHLINE 244
+#define RPL_LUSERCLIENT 251
+#define RPL_LUSEROP 252
+#define RPL_LUSERUNKNOWN 253
+#define RPL_LUSERCHANNELS 254
+#define RPL_LUSERME 255
+#define RPL_ADMINME 256
+#define RPL_ADMINLOC1 257
+#define RPL_ADMINLOC2 258
+#define RPL_ADMINEMAIL 259
+#define RPL_TRACELOG 261
+#define RPL_NONE 300
+#define RPL_AWAY 301
+#define RPL_USERHOST 302
+#define RPL_ISON 303
+#define RPL_UNAWAY 305
+#define RPL_NOWAWAY 306
+#define RPL_WHOISUSER 311
+#define RPL_WHOISSERVER 312
+#define RPL_WHOISOPERATOR 313
+#define RPL_WHOWASUSER 314
+#define RPL_ENDOFWHO 315
+#define RPL_WHOISIDLE 317
+#define RPL_ENDOFWHOIS 318
+#define RPL_WHOISCHANNELS 319
+#define RPL_LISTSTART 321
+#define RPL_LIST 322
+#define RPL_LISTEND 323
+#define RPL_CHANNELMODEIS 324
+#define RPL_NOTOPIC 331
+#define RPL_TOPIC 332
+#define RPL_INVITING 341
+#define RPL_SUMMONING 342
+#define RPL_VERSION 351
+#define RPL_WHOREPLY 352
+#define RPL_NAMREPLY 353
+#define RPL_LINKS 364
+#define RPL_ENDOFLINKS 365
+#define RPL_ENDOFNAMES 366
+#define RPL_BANLIST 367
+#define RPL_ENDOFBANLIST 368
+#define RPL_ENDOFWHOWAS 369
+#define RPL_INFO 371
+#define RPL_MOTD 372
+#define RPL_ENDOFINFO 374
+#define RPL_MOTDSTART 375
+#define RPL_ENDOFMOTD 376
+#define RPL_YOUREOPER 381
+#define RPL_REHASHING 382
+#define RPL_TIME 391
+#define RPL_USERSSTART 392
+#define RPL_USERS 393
+#define RPL_ENDOFUSERS 394
+#define RPL_NOUSERS 395
+
+#define ERR_NOSUCHNICK 401
+#define ERR_NOSUCHSERVER 402
+#define ERR_NOSUCHCHANNEL 403
+#define ERR_CANNOTSENDTOCHAN 404
+#define ERR_TOOMANYCHANNELS 405
+#define ERR_WASNOSUCHNICK 406
+#define ERR_TOOMANYTARGETS 407
+#define ERR_NOORIGIN 409
+#define ERR_NORECIPIENT 411
+#define ERR_NOTEXTTOSEND 412
+#define ERR_NOTOPLEVEL 413
+#define ERR_WILDTOPLEVEL 414
+#define ERR_UNKNOWNCOMMAND 421
+#define ERR_NOMOTD 422
+#define ERR_NOADMININFO 423
+#define ERR_FILEERROR 424
+#define ERR_NONICKNAMEGIVEN 431
+#define ERR_ERRONEUSNICKNAME 432
+#define ERR_NICKNAMEINUSE 433
+#define ERR_NICKCOLLISION 436
+#define ERR_USERNOTINCHANNEL 441
+#define ERR_NOTONCHANNEL 442
+#define ERR_USERONCHANNEL 443
+#define ERR_NOLOGIN 444
+#define ERR_SUMMONDISABLED 445
+#define ERR_USERSDISABLED 446
+#define ERR_NOTREGISTERED 451
+#define ERR_NEEDMOREPARAMS 461
+#define ERR_ALREADYREGISTRED 462
+#define ERR_NOPERMFORHOST 463
+#define ERR_PASSWDMISMATCH 464
+#define ERR_YOUREBANNEDCREEP 465
+#define ERR_KEYSET 467
+#define ERR_CHANNELISFULL 471
+#define ERR_UNKNOWNMODE 472
+#define ERR_INVITEONLYCHAN 473
+#define ERR_BANNEDFROMCHAN 474
+#define ERR_BADCHANNELKEY 475
+#define ERR_NOPRIVILEGES 481
+#define ERR_CHANOPRIVSNEEDED 482
+#define ERR_CANTKILLSERVER 483
+#define ERR_NOOPERHOST 491
+#define ERR_UMODEUNKNOWNFLAG 501
+#define ERR_USERSDONTMATCH 502
 
 #ifdef UIRC_IRCV3
-	/* https://ircv3.net/registry */
-	RPL_STARTTLS = 670,
-	ERR_STARTTLS = 691,
+/* https://ircv3.net/registry */
+#define RPL_STARTTLS 670
+#define ERR_STARTTLS 691
 
-	RPL_MONONLINE = 730,
-	RPL_MONOFFLINE = 731,
-	RPL_MONLIST = 732,
-	RPL_ENDOFMONLIST = 733,
-	ERR_MOLISTFULL = 734,
+#define RPL_MONONLINE 730
+#define RPL_MONOFFLINE 731
+#define RPL_MONLIST 732
+#define RPL_ENDOFMONLIST 733
+#define ERR_MOLISTFULL 734
 
-	RPL_LOGGEDIN = 900,
-	RPL_LOGGEDOUT = 901,
-	ERR_NICKLOCKED = 902,
-	RPL_SASLSUCCESS = 903,
-	ERR_SASLFAIL = 904,
-	ERR_SASLTOOLONG = 905,
-	ERR_SASLABORTED = 906,
-	ERR_SASLALREADY = 907,
-	ERR_SASLMECHS = 908
+#define RPL_LOGGEDIN 900
+#define RPL_LOGGEDOUT 901
+#define ERR_NICKLOCKED 902
+#define RPL_SASLSUCCESS 903
+#define ERR_SASLFAIL 904
+#define ERR_SASLTOOLONG 905
+#define ERR_SASLABORTED 906
+#define ERR_SASLALREADY 907
+#define ERR_SASLMECHS 908
 #endif
-};
+
 #endif