Route some more stuff through socket.h and hash_map.h. Add #define protection to timer.h and remove some unneeded includes and externs from timer.cpp

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3869 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 3 insertions, 7 deletions

diff --git a/include/typedefs.h b/include/typedefs.h
index 1bb65bebe..cd8c82039 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -1,6 +1,9 @@
 #ifndef __TYPEDEF_H__
 #define __TYPEDEF_H__
 
+#include <string>
+#include "inspircd_config.h"
+#include "hash_map.h"
 #include "users.h"
 #include "channels.h"
 #include "hashcomp.h"
@@ -9,13 +12,6 @@
 #include "inspircd.h"
 #include "modules.h"
 #include "globals.h"
-#include "inspircd_config.h"
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 
 typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
 typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;