diff --git a/Changes b/Changes
index 2e2aa8196..58fe1db6d 100644
--- a/Changes
+++ b/Changes
@@ -1778,3 +1778,5 @@ seen. gmtime warning still there
 - One more fix to the above
 - Patch by Syzop to fix a bug in the resolver
 - Preperations for beta14. Will be a recommended upgrade
+- Compile fixes regarding throttling
+- Fix when you use another make than make
diff --git a/include/hash.h b/include/hash.h
index f7001e766..997aa1a68 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -65,21 +65,6 @@ typedef struct hashentry {
 */
 #ifdef THROTTLING
 #define THROTTLING_HASH_SIZE	1024
-
-struct ThrottlingBucket
-{
-	struct ThrottlingBucket *next, *prev;
-	struct IN_ADDR	in;
-	time_t		since;
-};
-
-void	init_throttling_hash();
-int	hash_throttling(struct IN_ADDR *in);
-struct	ThrottlingBucket	*find_throttling_bucket(struct IN_ADDR *in);
-void	add_throttling_bucket(struct IN_ADDR *in);
-void	del_throttling_bucket(struct ThrottlingBucket *bucket);
-int	throttle_can_connect(struct IN_ADDR *in);
-
 #endif
 
 
@@ -87,5 +72,4 @@ int	throttle_can_connect(struct IN_ADDR *in);
 
 #define find_channel hash_find_channel
 
-
 #endif /* __hash_include__ */
diff --git a/include/struct.h b/include/struct.h
index 89536d8cc..0b09d4fd2 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -1443,5 +1443,24 @@ struct Command {
 #endif
 };
 
+#ifdef THROTTLING
+
+struct ThrottlingBucket
+{
+	struct ThrottlingBucket *next, *prev;
+	struct IN_ADDR	in;
+	time_t		since;
+};
+
+void	init_throttling_hash();
+int	hash_throttling(struct IN_ADDR *in);
+struct	ThrottlingBucket	*find_throttling_bucket(struct IN_ADDR *in);
+void	add_throttling_bucket(struct IN_ADDR *in);
+void	del_throttling_bucket(struct ThrottlingBucket *bucket);
+int	throttle_can_connect(struct IN_ADDR *in);
+
+#endif
+
+
 #endif /* __struct_include__ */
 
diff --git a/src/Makefile b/src/Makefile
index 191b23ba9..d1f19a109 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -53,7 +53,7 @@ all: build
 build: ircd mods
 
 custommodule:
-	cd modules; make $(MAKEARGS) MODULEFILE=$(MODULEFILE) EXLIBS=$(EXLIBS) custommodule
+	cd modules; $(MAKE) MODULEFILE=$(MODULEFILE) EXLIBS=$(EXLIBS) custommodule
 
 ircd: $(OBJS)
 	$(CC) $(CFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(IRCDLIBS) $(CRYPTOLIB)
@@ -76,7 +76,7 @@ mods:
 	@if [ ! -r modules ] ; then \
 		echo "You havent done cvs update -P -d"; \
 	fi
-	cd modules; make $(MAKEARGS) all
+	cd modules; $(MAKE) all
 
 version.c: version.c.SH ../Changes
 	$(SHELL) version.c.SH