-typedef nspace::hash_map<std::string, Channel*, nspace::hash<string>, irc::StrHashComp> chan_hash;
-#else
-/** User hash (windows systems with visual studio)
+typedef std::vector<std::string> file_cache;
+
+/** A mapping of configuration keys to their assigned values.
+ */
+typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> ConfigItems;
+
+/** The entire configuration
+ */
+typedef std::multimap<std::string, reference<ConfigTag>, irc::insensitive_swo> ConfigDataHash;
+
+/** Iterator of ConfigDataHash */
+typedef ConfigDataHash::const_iterator ConfigIter;
+/** Iterator pair, used for tag-name ranges */
+typedef std::pair<ConfigIter,ConfigIter> ConfigTagList;
+
+/** Files read by the configuration */
+typedef std::map<std::string, file_cache> ConfigFileCache;
+
+/** Generic user list, used for exceptions */
+typedef std::set<User*> CUList;
+
+/** Contains an ident and host split into two strings
+ */
+typedef std::pair<std::string, std::string> IdentHostPair;
+
+/** A map of xline factories