diff --git a/lib/dbi/ims.c b/lib/dbi/ims.c
index bdff0425c..dfe6afb1d 100644
--- a/lib/dbi/ims.c
+++ b/lib/dbi/ims.c
@@ -17,6 +17,8 @@
* along with this program. If not, see .
*/
+#include
+
#include "ogs-dbi.h"
int ogs_dbi_msisdn_data(
diff --git a/lib/dbi/ogs-mongoc.h b/lib/dbi/ogs-mongoc.h
index 9e3b4515b..5caa37985 100644
--- a/lib/dbi/ogs-mongoc.h
+++ b/lib/dbi/ogs-mongoc.h
@@ -24,8 +24,6 @@
#ifndef OGS_MONGOC_H
#define OGS_MONGOC_H
-#include
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
diff --git a/lib/dbi/session.c b/lib/dbi/session.c
index d0edb7218..ff1bbc9bc 100644
--- a/lib/dbi/session.c
+++ b/lib/dbi/session.c
@@ -17,6 +17,8 @@
* along with this program. If not, see .
*/
+#include
+
#include "ogs-dbi.h"
int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
diff --git a/lib/dbi/subscription.c b/lib/dbi/subscription.c
index dfd86214f..a541c2144 100644
--- a/lib/dbi/subscription.c
+++ b/lib/dbi/subscription.c
@@ -17,6 +17,8 @@
* along with this program. If not, see .
*/
+#include
+
#include "ogs-dbi.h"
int ogs_dbi_auth_info(char *supi, ogs_dbi_auth_info_t *auth_info)
diff --git a/tests/common/context.c b/tests/common/context.c
index 628d29406..0c33bae17 100644
--- a/tests/common/context.c
+++ b/tests/common/context.c
@@ -17,6 +17,8 @@
* along with this program. If not, see .
*/
+#include
+
#include "test-config-private.h"
#include "test-common.h"
diff --git a/tests/common/context.h b/tests/common/context.h
index 5481defd1..e62a57841 100644
--- a/tests/common/context.h
+++ b/tests/common/context.h
@@ -24,6 +24,8 @@
#ifndef TEST_COMMON_CONTEXT_H
#define TEST_COMMON_CONTEXT_H
+#include
+
#ifdef __cplusplus
extern "C" {
#endif