All core numerics should be in numeric.h not in .cpp files.

include/numeric.h

@@ -39,8 +39,11 @@ enum
 	ERR_UNKNOWNCOMMAND = 421,
 	ERR_NONICKNAMEGIVEN = 431,
 	ERR_ERRONEUSNICKNAME = 432,
+	ERR_NICKNAMEINUSE = 433,
 	ERR_USERNOTINCHANNEL = 441,
 	ERR_NOTONCHANNEL = 442,
+	ERR_NOTREGISTERED = 451,
+	ERR_NEEDMOREPARAMS = 461,
 	ERR_YOUREBANNEDCREEP = 465,
 	ERR_UNKNOWNMODE = 472,
 	ERR_BANNEDFROMCHAN = 474,
@@ -58,11 +61,17 @@ enum
 	// From irc2?
 	RPL_SAVENICK = 43,
 
+	// From ircu.
+	RPL_YOURDISPLAYEDHOST = 396,
+
 	// From UnrealIRCd.
 	ERR_CANTCHANGENICK = 447,
 
 	// InspIRCd-specific.
 	ERR_UNKNOWNSNOMASK = 501,
+	RPL_SYNTAX = 650,
+	ERR_LISTMODEALREADYSET = 697,
+	ERR_LISTMODENOTSET = 698,
 	ERR_CANTUNLOADMODULE = 972,
 	RPL_UNLOADEDMODULE = 973,
 	ERR_CANTLOADMODULE = 974,

src/commands.cpp

@@ -26,16 +26,6 @@
 
 #include "inspircd.h"
 
-enum
-{
-	// From RFC 1459.
-	ERR_NOTREGISTERED = 451,
-	ERR_NEEDMOREPARAMS = 461,
-
-	// InspIRCd-specific.
-	RPL_SYNTAX = 650,
-};
-
 bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Params& parameters, unsigned int splithere, int extra, bool usemax)
 {
 	if (splithere >= parameters.size())

src/listmode.cpp

@@ -23,13 +23,6 @@
 #include "inspircd.h"
 #include "listmode.h"
 
-enum
-{
-	// InspIRCd-specific.
-	ERR_LISTMODEALREADYSET = 697,
-	ERR_LISTMODENOTSET = 698,
-};
-
 ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modechar, unsigned int lnum, unsigned int eolnum)
 	: ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_LIST)
 	, listnumeric(lnum)

src/users.cpp

@@ -33,15 +33,6 @@
 #include "utility/string.h"
 #include "xline.h"
 
-enum
-{
-	// From RFC 1459.
-	ERR_NICKNAMEINUSE = 433,
-
-	// From ircu.
-	RPL_YOURDISPLAYEDHOST = 396,
-};
-
 ClientProtocol::MessageList LocalUser::sendmsglist;
 
 bool User::IsNoticeMaskSet(unsigned char sm) const