diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4a206d..65747bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ set (network_SOURCES
 	${PROJECT_SOURCE_DIR}/network/timeout.c
 	${PROJECT_SOURCE_DIR}/network/timer.c
 	${PROJECT_SOURCE_DIR}/network/network.c
-	${PROJECT_SOURCE_DIR}/util/ipcalc.c
+	${PROJECT_SOURCE_DIR}/network/ipcalc.c
 )
 
 set (uhub_SOURCES
diff --git a/src/util/ipcalc.c b/src/network/ipcalc.c
similarity index 100%
rename from src/util/ipcalc.c
rename to src/network/ipcalc.c
diff --git a/src/util/ipcalc.h b/src/network/ipcalc.h
similarity index 100%
rename from src/util/ipcalc.h
rename to src/network/ipcalc.h
diff --git a/src/network/network.h b/src/network/network.h
index ef02ba6..47add6f 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -31,6 +31,7 @@ struct net_statistics
 };
 
 struct net_socket_t;
+struct ip_addr_encap;
 
 /**
  * Initialize the socket monitor subsystem.
diff --git a/src/plugin_api/handle.h b/src/plugin_api/handle.h
index b9ab3ea..56c17e2 100644
--- a/src/plugin_api/handle.h
+++ b/src/plugin_api/handle.h
@@ -26,7 +26,7 @@
 
 #include "system.h"
 #include "util/credentials.h"
-#include "util/ipcalc.h"
+#include "network/ipcalc.h"
 #include "plugin_api/types.h"
 
 typedef void (*on_connection_accepted_t)(struct plugin_handle*, struct ip_addr_encap*);
diff --git a/src/plugins/mod_auth_simple.c b/src/plugins/mod_auth_simple.c
index e2953ba..d4c35d3 100644
--- a/src/plugins/mod_auth_simple.c
+++ b/src/plugins/mod_auth_simple.c
@@ -20,7 +20,6 @@
 #include "plugin_api/handle.h"
 #include "util/memory.h"
 #include "util/list.h"
-#include "util/ipcalc.h"
 #include "util/misc.h"
 #include "util/log.h"
 #include "util/config_token.h"
diff --git a/src/plugins/mod_auth_sqlite.c b/src/plugins/mod_auth_sqlite.c
index 7462794..ab36674 100644
--- a/src/plugins/mod_auth_sqlite.c
+++ b/src/plugins/mod_auth_sqlite.c
@@ -21,7 +21,6 @@
 #include <sqlite3.h>
 #include "util/memory.h"
 #include "util/list.h"
-#include "util/ipcalc.h"
 #include "util/misc.h"
 #include "util/log.h"
 #include "util/config_token.h"
diff --git a/src/plugins/mod_logging.c b/src/plugins/mod_logging.c
index d669e55..3dcace0 100644
--- a/src/plugins/mod_logging.c
+++ b/src/plugins/mod_logging.c
@@ -21,7 +21,7 @@
 #include "adc/adcconst.h"
 #include "adc/sid.h"
 #include "util/memory.h"
-#include "util/ipcalc.h"
+#include "network/ipcalc.h"
 #include "plugin_api/handle.h"
 
 #include "util/misc.h"
diff --git a/src/plugins/mod_welcome.c b/src/plugins/mod_welcome.c
index 0dfd63b..1bd53c5 100644
--- a/src/plugins/mod_welcome.c
+++ b/src/plugins/mod_welcome.c
@@ -22,7 +22,7 @@
 #include "adc/sid.h"
 #include "util/cbuffer.h"
 #include "util/memory.h"
-#include "util/ipcalc.h"
+#include "network/ipcalc.h"
 #include "plugin_api/handle.h"
 #include "plugin_api/command_api.h"
 
diff --git a/src/uhub.h b/src/uhub.h
index 40ba37a..275e091 100644
--- a/src/uhub.h
+++ b/src/uhub.h
@@ -63,7 +63,6 @@ extern "C" {
 #include "util/credentials.h"
 #include "util/floodctl.h"
 #include "util/getopt.h"
-#include "util/ipcalc.h"
 #include "util/list.h"
 #include "util/log.h"
 #include "util/memory.h"
@@ -75,6 +74,7 @@ extern "C" {
 
 #include "network/network.h"
 #include "network/connection.h"
+#include "network/ipcalc.h"
 #include "network/timeout.h"
 
 #include "core/auth.h"