Clean up and reorganize our header files

1 files changed, 16 insertions, 10 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 87cf8532c..55f185057 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,12 +25,18 @@
 
 #include "services.h"
 #include "timers.h"
-#include "modules.h"
-
-#ifdef _WIN32
-# include <process.h>
-# define execve _execve
-#endif
+#include "extern.h"
+#include "uplink.h"
+#include "config.h"
+#include "protocol.h"
+#include "servers.h"
+#include "bots.h"
+#include "dns.h"
+#include "signals.h"
+#include "socketengine.h"
+
+#include <unistd.h>
+#include <limits.h>
 
 /******** Global variables! ********/
 
@@ -229,7 +235,7 @@ static void Connect()
 	if (static_cast<unsigned>(++CurrentUplink) >= Config->Uplinks.size())
 		CurrentUplink = 0;
 
-	Uplink *u = Config->Uplinks[CurrentUplink];
+	ServerConfig::Uplink *u = Config->Uplinks[CurrentUplink];
 
 	new UplinkSocket();
 	if (!Config->LocalHost.empty())
@@ -340,9 +346,9 @@ int main(int ac, char **av, char **envp)
 	/* If we're root, issue a warning now */
 	if (!getuid() && !getgid())
 	{
-		std::cout << "WARNING: You are currently running Anope as the root superuser. Anope does not" << std::endl;
-		std::cout << "         require root privileges to run, and it is discouraged that you run Anope" << std::endl;
-		std::cout << "         as the root superuser." << std::endl;
+		std::cerr << "WARNING: You are currently running Anope as the root superuser. Anope does not" << std::endl;
+		std::cerr << "         require root privileges to run, and it is discouraged that you run Anope" << std::endl;
+		std::cerr << "         as the root superuser." << std::endl;
 		sleep(3);
 	}
 #endif