8 files changed, 15 insertions, 29 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index fbd0dc31..80d33cd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,6 @@ endif
 
 noinst_HEADERS = \
 	nls.h \
-	common.h \
-	common-setup.h
+	common.h
 
 SUBDIRS = lib-popt lib-config core irc fe-common $(PERLDIR) $(TEXTUI) $(BOTUI)
diff --git a/src/common-setup.h b/src/common-setup.h
deleted file mode 100644
index 9bdd6eeb..00000000
--- a/src/common-setup.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __COMMON_SETUP_H
-#define __COMMON_SETUP_H
-
-#define LOG_FILE_CREATE_MODE 0644
-
-/* wait for half an hour before trying to reconnect to host where last
-   connection failed */
-#define FAILED_RECONNECT_WAIT (60*30)
-
-/* How often to check if there's anyone to be unignored in autoignore list */
-#define AUTOIGNORE_TIMECHECK 10000
-
-/* How often to check if there's anyone to be unbanned in knockout list */
-#define KNOCKOUT_TIMECHECK 10000
-
-/* How often to check for gone status of nick */
-#define MAX_GONE_REFRESH_TIME 300
-
-/* How long to keep netsplits in memory (seconds) */
-#define NETSPLIT_MAX_REMEMBER (60*30)
-
-#endif
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 59d85da3..ea720edb 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -24,7 +24,6 @@
 #include "misc.h"
 #include "special-vars.h"
 #include "settings.h"
-#include "common-setup.h"
 
 #include "bans.h"
 #include "channels.h"
@@ -34,6 +33,9 @@
 #include "server-redirect.h"
 #include "server-setup.h"
 
+/* How often to check if there's anyone to be unbanned in knockout list */
+#define KNOCKOUT_TIMECHECK 10000
+
 typedef struct {
 	CHANNEL_REC *channel;
 	char *ban;
diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 34c478cf..5d7d3bf3 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -22,11 +22,13 @@
 #include "signals.h"
 #include "commands.h"
 #include "misc.h"
-#include "common-setup.h"
 
 #include "irc-server.h"
 #include "netsplit.h"
 
+/* How long to keep netsplits in memory (seconds) */
+#define NETSPLIT_MAX_REMEMBER (60*30)
+
 static int split_tag;
 
 static NETSPLIT_SERVER_REC *netsplit_server_find(IRC_SERVER_REC *server, const char *servername, const char *destserver)
diff --git a/src/irc/core/server-reconnect.c b/src/irc/core/server-reconnect.c
index a89fc59f..c4821364 100644
--- a/src/irc/core/server-reconnect.c
+++ b/src/irc/core/server-reconnect.c
@@ -31,7 +31,6 @@
 #include "server-reconnect.h"
 
 #include "settings.h"
-#include "common-setup.h"
 
 GSList *reconnects;
 static int last_reconnect_tag;
diff --git a/src/irc/core/server-reconnect.h b/src/irc/core/server-reconnect.h
index 6f4b5336..9df7f2cc 100644
--- a/src/irc/core/server-reconnect.h
+++ b/src/irc/core/server-reconnect.h
@@ -1,6 +1,10 @@
 #ifndef __SERVER_RECONNECT_H
 #define __SERVER_RECONNECT_H
 
+/* wait for half an hour before trying to reconnect to host where last
+   connection failed */
+#define FAILED_RECONNECT_WAIT (60*30)
+
 typedef struct {
 	int tag;
 	time_t next_connect;
diff --git a/src/irc/core/server-setup.c b/src/irc/core/server-setup.c
index 324a4575..c7c39236 100644
--- a/src/irc/core/server-setup.c
+++ b/src/irc/core/server-setup.c
@@ -23,10 +23,10 @@
 #include "network.h"
 #include "lib-config/iconfig.h"
 #include "settings.h"
-#include "common-setup.h"
 
 #include "irc-server.h"
 #include "server-setup.h"
+#include "server-reconnect.h"
 #include "ircnet-setup.h"
 
 GSList *setupservers; /* list of irc servers */
diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c
index da384dd9..1b3f757f 100644
--- a/src/irc/flood/autoignore.c
+++ b/src/irc/flood/autoignore.c
@@ -25,13 +25,15 @@
 #include "levels.h"
 #include "misc.h"
 #include "settings.h"
-#include "common-setup.h"
 
 #include "irc-server.h"
 #include "ignore.h"
 
 #include "autoignore.h"
 
+/* How often to check if there's anyone to be unignored in autoignore list */
+#define AUTOIGNORE_TIMECHECK 10000
+
 static int ignore_tag;
 
 GSList *server_autoignores(IRC_SERVER_REC *server)