diff --git a/src/device.c b/src/device.c
index b2126b1b..7825011c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2757,7 +2757,7 @@ bool device_init(void)
 	return true;
 }
 
-bool device_exit(void)
+void device_exit(void)
 {
 	if (!l_queue_isempty(device_list))
 		l_warn("device_list isn't empty!");
@@ -2768,6 +2768,4 @@ bool device_exit(void)
 	watchlist_destroy(&device_watches);
 
 	l_dbus_unregister_interface(dbus_get_bus(), IWD_DEVICE_INTERFACE);
-
-	return true;
 }
diff --git a/src/device.h b/src/device.h
index 706c2ed0..7969d4bf 100644
--- a/src/device.h
+++ b/src/device.h
@@ -90,6 +90,3 @@ int device_disconnect(struct device *device);
 
 struct device *device_create(struct wiphy *wiphy, struct netdev *netdev);
 void device_remove(struct device *device);
-
-bool device_init(void);
-bool device_exit(void);
diff --git a/src/iwd.h b/src/iwd.h
index 844b4d3a..33e249a1 100644
--- a/src/iwd.h
+++ b/src/iwd.h
@@ -43,3 +43,6 @@ bool wsc_exit();
 
 bool known_networks_init(void);
 void known_networks_exit(void);
+
+bool device_init(void);
+void device_exit(void);
diff --git a/src/main.c b/src/main.c
index 0b255fa9..9aaa9a1b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,7 +35,6 @@
 
 #include "src/iwd.h"
 #include "src/netdev.h"
-#include "src/device.h"
 #include "src/wiphy.h"
 #include "src/dbus.h"
 #include "src/eap.h"