diff --git a/include/import/da.h b/include/import/da.h
index 90e1f7d0d..3817e5ddb 100644
--- a/include/import/da.h
+++ b/include/import/da.h
@@ -5,6 +5,5 @@
 #include <types/global.h>
 #include <dac.h>
 
-void deinit_deviceatlas(void);
 #endif
 #endif
diff --git a/src/da.c b/src/da.c
index 843da9fa7..9ea266f2c 100644
--- a/src/da.c
+++ b/src/da.c
@@ -146,7 +146,7 @@ out:
 	return err_code;
 }
 
-void deinit_deviceatlas(void)
+static void deinit_deviceatlas(void)
 {
 	if (global.deviceatlas.jsonpath != 0) {
 		free(global.deviceatlas.jsonpath);
@@ -374,4 +374,5 @@ static void __da_init(void)
 	cfg_register_keywords(&dacfg_kws);
 	hap_register_build_opts("Built with DeviceAtlas support.", 0);
 	hap_register_post_check(init_deviceatlas);
+	hap_register_post_deinit(deinit_deviceatlas);
 }
diff --git a/src/haproxy.c b/src/haproxy.c
index 140c3e0f3..be6fa66de 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -113,10 +113,6 @@
 #include <proto/ssl_sock.h>
 #endif
 
-#ifdef USE_DEVICEATLAS
-#include <import/da.h>
-#endif
-
 /* list of config files */
 static struct list cfg_cfgfiles = LIST_HEAD_INIT(cfg_cfgfiles);
 int  pid;			/* current process id */
@@ -1571,10 +1567,6 @@ static void deinit(void)
 
 	protocol_unbind_all();
 
-#if defined(USE_DEVICEATLAS)
-	deinit_deviceatlas();
-#endif
-
 	list_for_each_entry(pdf, &post_deinit_list, list)
 		pdf->fct();