more header reorg

diff --git a/src/common.h b/src/common.h
index ea3e3fa..7577bae 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -39,7 +39,6 @@ struct tls;
 #endif
 #include <uv.h>
 
-#include "netpoll.h"
 #include "map.h"
 
 #define MAX_NICKLEN 32
@@ -146,6 +145,4 @@ extern channelmap channel_map;
 extern stringset autojoin;
 extern struct client_data  *clients;
 extern struct client_data  *dyingclients;
-
-#include "admin.h"
 #endif

diff --git a/src/irc.cpp b/src/irc.cpp
index 900ebbc..685bd60 100644 (file)
--- a/src/irc.cpp
+++ b/src/irc.cpp
@@ -6,6 +6,7 @@
 #include "ircfmt.h"
 #include "passwd.h"
 #include "job.h"
+#include "admin.h"
 std::vector<char> databuf;
 clientmap client_map = {};
 channelmap channel_map = {};

diff --git a/src/main.cpp b/src/main.cpp
index b5be910..114c001 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,8 +3,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "common.h"
 #include "net.h"
+#include "netpoll.h"
 #include "irc.h"
 #include "job.h"
+#include "admin.h"
 
 static int is_running = 1;
 

diff --git a/src/net.cpp b/src/net.cpp
index cf0b731..047a381 100644 (file)
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -3,9 +3,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "common.h"
 #include "net.h"
+#include "netpoll.h"
 #include "irc.h"
 #include "ircfmt.h"
 #include "job.h"
+#include "admin.h"
 void update_poll_reg(struct client_data *cl)
 {
        if (cl->fd == -1)