diff -purN Unreal3.2.5.orig/include/dynconf.h Unreal3.2.5/include/dynconf.h
--- Unreal3.2.5.orig/include/dynconf.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/include/dynconf.h	2006-08-09 00:10:34.511660716 -0400
@@ -87,10 +87,8 @@ struct zConfiguration {
 	int  host_retries;
 	char *name_server;
 	char *dns_bindip;
-#ifdef THROTTLING
 	long throttle_period;
 	char throttle_count;
-#endif
 	char *kline_address;
 	char *gline_address;
 	long conn_modes;
@@ -212,10 +210,8 @@ extern MODVAR aConfiguration iConf;
 #define RESTRICT_USERMODES		iConf.restrict_usermodes
 #define RESTRICT_CHANNELMODES		iConf.restrict_channelmodes
 #define RESTRICT_EXTENDEDBANS		iConf.restrict_extendedbans
-#ifdef THROTTLING
 #define THROTTLING_PERIOD		iConf.throttle_period
 #define THROTTLING_COUNT		iConf.throttle_count
-#endif
 #define USE_BAN_VERSION			iConf.use_ban_version
 #define UNKNOWN_FLOOD_BANTIME		iConf.unknown_flood_bantime
 #define UNKNOWN_FLOOD_AMOUNT		iConf.unknown_flood_amount
@@ -280,10 +276,8 @@ struct SetCheck {
 	unsigned has_dns_timeout:1;
 	unsigned has_dns_retries:1;
 	unsigned has_dns_nameserver:1;
-#ifdef THROTTLING
 	unsigned has_throttle_period:1;
 	unsigned has_throttle_connections:1;
-#endif
 	unsigned has_kline_address:1;
 	unsigned has_gline_address:1;
 	unsigned has_modes_on_connect:1;
diff -purN Unreal3.2.5.orig/include/hash.h Unreal3.2.5/include/hash.h
--- Unreal3.2.5.orig/include/hash.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/include/hash.h	2006-08-09 00:11:04.345167425 -0400
@@ -63,10 +63,7 @@ typedef struct hashentry {
 /*
  * Throttling
 */
-#ifdef THROTTLING
 #define THROTTLING_HASH_SIZE	1019 /* prime number */
-#endif
-
 
 #define NullChn ((aChannel *)0)
 
diff -purN Unreal3.2.5.orig/include/h.h Unreal3.2.5/include/h.h
--- Unreal3.2.5.orig/include/h.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/include/h.h	2006-08-09 00:10:44.904185572 -0400
@@ -104,9 +104,7 @@ extern MODVAR ConfigItem_offchans	*conf_
 extern int		completed_connection(aClient *);
 extern void clear_unknown();
 extern EVENT(e_unload_module_delayed);
-#ifdef THROTTLING
 extern EVENT(e_clean_out_throttling_buckets);
-#endif
 
 extern void  module_loadall(int module_load);
 extern long set_usermode(char *umode);
diff -purN Unreal3.2.5.orig/include/struct.h Unreal3.2.5/include/struct.h
--- Unreal3.2.5.orig/include/struct.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/include/struct.h	2006-08-09 00:11:21.670042427 -0400
@@ -1773,8 +1773,6 @@ struct _cmdoverride {
 	int			(*func)();
 };
 
-#ifdef THROTTLING
-
 struct ThrottlingBucket
 {
 	struct ThrottlingBucket *prev, *next;
@@ -1833,8 +1831,6 @@ void	add_throttling_bucket(struct IN_ADD
 void	del_throttling_bucket(struct ThrottlingBucket *bucket);
 int	throttle_can_connect(aClient *, struct IN_ADDR *in);
 
-#endif
-
 #define VERIFY_OPERCOUNT(clnt,tag) { if (IRCstats.operators < 0) verify_opercount(clnt,tag); } while(0)
 
 #define MARK_AS_OFFICIAL_MODULE(modinf)	do { if (modinf && modinf->handle) ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);  } while(0)
diff -purN Unreal3.2.5.orig/src/hash.c Unreal3.2.5/src/hash.c
--- Unreal3.2.5.orig/src/hash.c	2005-03-13 16:02:52.000000000 -0500
+++ Unreal3.2.5/src/hash.c	2006-08-09 00:07:37.190706550 -0400
@@ -745,8 +745,6 @@ int   hash_del_watch_list(aClient *cptr)
  * -by Stskeeps
 */
 
-#ifdef THROTTLING
-
 struct	MODVAR ThrottlingBucket	*ThrottlingHash[THROTTLING_HASH_SIZE+1];
 
 void	init_throttling_hash()
@@ -875,5 +873,3 @@ int	throttle_can_connect(aClient *sptr, 
 		return 2;
 	}
 }
-
-#endif
diff -purN Unreal3.2.5.orig/src/include/dynconf.h Unreal3.2.5/src/include/dynconf.h
--- Unreal3.2.5.orig/src/include/dynconf.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/src/include/dynconf.h	2006-08-09 00:10:34.511660716 -0400
@@ -87,10 +87,8 @@ struct zConfiguration {
 	int  host_retries;
 	char *name_server;
 	char *dns_bindip;
-#ifdef THROTTLING
 	long throttle_period;
 	char throttle_count;
-#endif
 	char *kline_address;
 	char *gline_address;
 	long conn_modes;
@@ -212,10 +210,8 @@ extern MODVAR aConfiguration iConf;
 #define RESTRICT_USERMODES		iConf.restrict_usermodes
 #define RESTRICT_CHANNELMODES		iConf.restrict_channelmodes
 #define RESTRICT_EXTENDEDBANS		iConf.restrict_extendedbans
-#ifdef THROTTLING
 #define THROTTLING_PERIOD		iConf.throttle_period
 #define THROTTLING_COUNT		iConf.throttle_count
-#endif
 #define USE_BAN_VERSION			iConf.use_ban_version
 #define UNKNOWN_FLOOD_BANTIME		iConf.unknown_flood_bantime
 #define UNKNOWN_FLOOD_AMOUNT		iConf.unknown_flood_amount
@@ -280,10 +276,8 @@ struct SetCheck {
 	unsigned has_dns_timeout:1;
 	unsigned has_dns_retries:1;
 	unsigned has_dns_nameserver:1;
-#ifdef THROTTLING
 	unsigned has_throttle_period:1;
 	unsigned has_throttle_connections:1;
-#endif
 	unsigned has_kline_address:1;
 	unsigned has_gline_address:1;
 	unsigned has_modes_on_connect:1;
diff -purN Unreal3.2.5.orig/src/include/hash.h Unreal3.2.5/src/include/hash.h
--- Unreal3.2.5.orig/src/include/hash.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/src/include/hash.h	2006-08-09 00:11:04.345167425 -0400
@@ -63,10 +63,7 @@ typedef struct hashentry {
 /*
  * Throttling
 */
-#ifdef THROTTLING
 #define THROTTLING_HASH_SIZE	1019 /* prime number */
-#endif
-
 
 #define NullChn ((aChannel *)0)
 
diff -purN Unreal3.2.5.orig/src/include/h.h Unreal3.2.5/src/include/h.h
--- Unreal3.2.5.orig/src/include/h.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/src/include/h.h	2006-08-09 00:10:44.904185572 -0400
@@ -104,9 +104,7 @@ extern MODVAR ConfigItem_offchans	*conf_
 extern int		completed_connection(aClient *);
 extern void clear_unknown();
 extern EVENT(e_unload_module_delayed);
-#ifdef THROTTLING
 extern EVENT(e_clean_out_throttling_buckets);
-#endif
 
 extern void  module_loadall(int module_load);
 extern long set_usermode(char *umode);
diff -purN Unreal3.2.5.orig/src/include/struct.h Unreal3.2.5/src/include/struct.h
--- Unreal3.2.5.orig/src/include/struct.h	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/src/include/struct.h	2006-08-09 00:11:21.670042427 -0400
@@ -1773,8 +1773,6 @@ struct _cmdoverride {
 	int			(*func)();
 };
 
-#ifdef THROTTLING
-
 struct ThrottlingBucket
 {
 	struct ThrottlingBucket *prev, *next;
@@ -1833,8 +1831,6 @@ void	add_throttling_bucket(struct IN_ADD
 void	del_throttling_bucket(struct ThrottlingBucket *bucket);
 int	throttle_can_connect(aClient *, struct IN_ADDR *in);
 
-#endif
-
 #define VERIFY_OPERCOUNT(clnt,tag) { if (IRCstats.operators < 0) verify_opercount(clnt,tag); } while(0)
 
 #define MARK_AS_OFFICIAL_MODULE(modinf)	do { if (modinf && modinf->handle) ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);  } while(0)
Files Unreal3.2.5.orig/src/ircd and Unreal3.2.5/src/ircd differ
diff -purN Unreal3.2.5.orig/src/ircd.c Unreal3.2.5/src/ircd.c
--- Unreal3.2.5.orig/src/ircd.c	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/src/ircd.c	2006-08-09 00:08:09.404333079 -0400
@@ -1443,9 +1443,7 @@ int InitwIRCD(int argc, char *argv[])
 	write_pidfile();
 	Debug((DEBUG_NOTICE, "Server ready..."));
 	SetupEvents();
-#ifdef THROTTLING
 	init_throttling_hash();
-#endif
 #ifdef NEWCHFLOODPROT
 	init_modef();
 #endif
diff -purN Unreal3.2.5.orig/src/modules/m_pass.c Unreal3.2.5/src/modules/m_pass.c
--- Unreal3.2.5.orig/src/modules/m_pass.c	2006-06-16 14:29:17.000000000 -0400
+++ Unreal3.2.5/src/modules/m_pass.c	2006-08-09 00:09:06.367209422 -0400
@@ -124,7 +124,6 @@ ConfigItem_ban *bconf;
 		ircsprintf(zlinebuf, "Z:Lined (%s)", tk->reason);
 		return exit_client(cptr, cptr, &me, zlinebuf);
 	}
-#ifdef THROTTLING
 	else
 	{
 		int val;
@@ -137,7 +136,6 @@ ConfigItem_ban *bconf;
 		else if (val == 1)
 			add_throttling_bucket(&cptr->ip);
 	}
-#endif
 	return 0;
 }
 
diff -purN Unreal3.2.5.orig/src/modules/m_stats.c Unreal3.2.5/src/modules/m_stats.c
--- Unreal3.2.5.orig/src/modules/m_stats.c	2006-06-16 14:29:17.000000000 -0400
+++ Unreal3.2.5/src/modules/m_stats.c	2006-08-09 00:09:13.291559082 -0400
@@ -1356,12 +1356,10 @@ int stats_set(aClient *sptr, char *para)
 		    sptr->name, DNS_BINDIP);
 	sendto_one(sptr, ":%s %i %s :ban-version-tkl-time: %s", me.name, RPL_TEXT,
 	    sptr->name, pretty_time_val(BAN_VERSION_TKL_TIME));
-#ifdef THROTTLING
 	sendto_one(sptr, ":%s %i %s :throttle::period: %s", me.name, RPL_TEXT,
 			sptr->name, THROTTLING_PERIOD ? pretty_time_val(THROTTLING_PERIOD) : "disabled");
 	sendto_one(sptr, ":%s %i %s :throttle::connections: %d", me.name, RPL_TEXT,
 			sptr->name, THROTTLING_COUNT ? THROTTLING_COUNT : -1);
-#endif
 	sendto_one(sptr, ":%s %i %s :anti-flood::unknown-flood-bantime: %s", me.name, RPL_TEXT,
 			sptr->name, pretty_time_val(UNKNOWN_FLOOD_BANTIME));
 	sendto_one(sptr, ":%s %i %s :anti-flood::unknown-flood-amount: %ldKB", me.name, RPL_TEXT,
diff -purN Unreal3.2.5.orig/src/s_bsd.c Unreal3.2.5/src/s_bsd.c
--- Unreal3.2.5.orig/src/s_bsd.c	2006-06-16 14:29:14.000000000 -0400
+++ Unreal3.2.5/src/s_bsd.c	2006-08-09 00:08:22.092973773 -0400
@@ -1282,7 +1282,6 @@ add_con_refuse:
 			send(fd, zlinebuf, strlen(zlinebuf), 0);
 			goto add_con_refuse;
 		}
-#ifdef THROTTLING
 		else
 		{
 			int val;
@@ -1301,7 +1300,6 @@ add_con_refuse:
 			else if (val == 1)
 				add_throttling_bucket(&acptr->ip);
 		}
-#endif
 		acptr->port = ntohs(addr.SIN_PORT);
 	}
 
diff -purN Unreal3.2.5.orig/src/s_conf.c Unreal3.2.5/src/s_conf.c
--- Unreal3.2.5.orig/src/s_conf.c	2006-06-16 14:29:15.000000000 -0400
+++ Unreal3.2.5/src/s_conf.c	2006-08-09 00:09:41.604988867 -0400
@@ -2277,14 +2277,12 @@ int	config_run()
 	free_iConf(&iConf);
 	bcopy(&tempiConf, &iConf, sizeof(aConfiguration));
 	bzero(&tempiConf, sizeof(aConfiguration));
-#ifdef THROTTLING
 	{
 		EventInfo eInfo;
 		eInfo.flags = EMOD_EVERY;
 		eInfo.every = THROTTLING_PERIOD ? THROTTLING_PERIOD/2 : 86400;
 		EventMod(EventFind("bucketcleaning"), &eInfo);
 	}
-#endif
 
 	if (errors > 0)
 	{
@@ -4713,7 +4711,6 @@ int     _conf_except(ConfigFile *conf, C
 			}
 		}
 	}
-#ifdef THROTTLING
 	else if (!strcmp(ce->ce_vardata, "throttle")) {
 		for (cep = ce->ce_entries; cep; cep = cep->ce_next)
 		{
@@ -4734,7 +4731,6 @@ int     _conf_except(ConfigFile *conf, C
 		}
 
 	}
-#endif
 	else if (!strcmp(ce->ce_vardata, "tkl")) {
 		ConfigEntry *mask = NULL, *type = NULL;
 		for (cep = ce->ce_entries; cep; cep = cep->ce_next)
@@ -4814,7 +4810,6 @@ int     _test_except(ConfigFile *conf, C
 		}
 		return errors;
 	}
-#ifdef THROTTLING
 	else if (!strcmp(ce->ce_vardata, "throttle")) {
 		for (cep = ce->ce_entries; cep; cep = cep->ce_next)
 		{
@@ -4849,7 +4844,6 @@ int     _test_except(ConfigFile *conf, C
 		}
 		return errors;
 	}
-#endif
 	else if (!strcmp(ce->ce_vardata, "tkl")) {
 		char has_type = 0;
 
@@ -6782,7 +6776,6 @@ int	_conf_set(ConfigFile *conf, ConfigEn
 				}
 			}
 		}
-#ifdef THROTTLING
 		else if (!strcmp(cep->ce_varname, "throttle")) {
 			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
 				if (!strcmp(cepp->ce_varname, "period")) 
@@ -6791,7 +6784,6 @@ int	_conf_set(ConfigFile *conf, ConfigEn
 					tempiConf.throttle_count = atoi(cepp->ce_vardata);
 			}
 		}
-#endif
 		else if (!strcmp(cep->ce_varname, "anti-flood")) {
 			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
 				if (!strcmp(cepp->ce_varname, "unknown-flood-bantime")) 
@@ -7395,7 +7387,6 @@ int	_test_set(ConfigFile *conf, ConfigEn
 				}
 			}
 		}
-#ifdef THROTTLING
 		else if (!strcmp(cep->ce_varname, "throttle")) {
 			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
 				CheckNull(cepp);
@@ -7432,7 +7423,6 @@ int	_test_set(ConfigFile *conf, ConfigEn
 				}
 			}
 		}
-#endif
 		else if (!strcmp(cep->ce_varname, "anti-flood")) {
 			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
 				CheckNull(cepp);