Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[user/henk/code/inspircd.git] / include / globals.h

diff --git a/include/globals.h b/include/globals.h
index d30f18edea57dffd095b0bd20b464be90724404a..fce5fc043d8562a2fd0f9478fb0fa0255d47401e 100644 (file)
--- a/include/globals.h
+++ b/include/globals.h
@@ -17,20 +17,14 @@
 #ifndef __WORLD_H
 #define __WORLD_H
 
-// include the common header files
-
-#include <typeinfo>
-#include <iostream>
 #include <string>
 #include <deque>
-#include "users.h"
-#include "channels.h"
+#include <map>
+#include <vector>
 
 typedef std::deque<std::string> file_cache;
 typedef std::pair< std::string, std::string > KeyVal;
 typedef std::vector< KeyVal > KeyValList;
 typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
-int isnick(const char *n);
-
 #endif