diff --git a/configs/open5gs/nrf.yaml.in b/configs/open5gs/nrf.yaml.in
index c29148fbb..ab1a52961 100644
--- a/configs/open5gs/nrf.yaml.in
+++ b/configs/open5gs/nrf.yaml.in
@@ -1,5 +1,3 @@
-db_uri: mongodb://localhost/open5gs
-
 #
 # logger:
 #
diff --git a/lib/app/meson.build b/lib/app/meson.build
index 6d6e0d4d8..0a23d713e 100644
--- a/lib/app/meson.build
+++ b/lib/app/meson.build
@@ -38,11 +38,11 @@ libapp = library('ogsapp',
     version : libogslib_version,
     c_args : '-DOGS_APP_COMPILATION',
     include_directories : [libapp_inc, libinc],
-    dependencies : [libproto_dep, yaml_dep],
+    dependencies : [libcore_dep, yaml_dep],
     install : true)
 
 libapp_dep = declare_dependency(
     link_with : libapp,
     include_directories : [libapp_inc, libinc],
-    dependencies : [libproto_dep, yaml_dep],
+    dependencies : [libcore_dep, yaml_dep],
 )
diff --git a/lib/app/ogs-app.h b/lib/app/ogs-app.h
index a5f8f6c7b..167625a37 100644
--- a/lib/app/ogs-app.h
+++ b/lib/app/ogs-app.h
@@ -20,7 +20,7 @@
 #ifndef OGS_APP_H
 #define OGS_APP_H
 
-#include "ogs-proto.h"
+#include "proto/ogs-proto.h"
 
 #define OGS_APP_INSIDE
 
diff --git a/lib/asn1c/common/asn_internal.h b/lib/asn1c/common/asn_internal.h
index 6c472cdaf..6fc5478ab 100644
--- a/lib/asn1c/common/asn_internal.h
+++ b/lib/asn1c/common/asn_internal.h
@@ -40,7 +40,7 @@ int get_asn1c_environment_version(void);	/* Run-time version */
 #define	REALLOC(oldptr, size)	realloc(oldptr, size)
 #define	FREEMEM(ptr)		free(ptr)
 #else
-#include "ogs-proto.h"
+#include "proto/ogs-proto.h"
 
 static ogs_inline void *ogs_asn_malloc(size_t size, const char *file_line)
 {
diff --git a/lib/asn1c/common/meson.build b/lib/asn1c/common/meson.build
index 285ae7f87..c984ecd6b 100644
--- a/lib/asn1c/common/meson.build
+++ b/lib/asn1c/common/meson.build
@@ -171,10 +171,10 @@ libasn1c_common = library('ogsasn1c-common',
     version : libogslib_version,
     c_args : libasn1c_common_cc_flags,
     include_directories : libasn1c_common_inc,
-    dependencies : libproto_dep,
+    dependencies : libcore_dep,
     install : true)
 
 libasn1c_common_dep = declare_dependency(
     link_with : libasn1c_common,
     include_directories : libasn1c_common_inc,
-    dependencies : libproto_dep)
+    dependencies : libcore_dep)
diff --git a/lib/crypt/ogs-crypt.h b/lib/crypt/ogs-crypt.h
index a55cf50d9..69f294547 100644
--- a/lib/crypt/ogs-crypt.h
+++ b/lib/crypt/ogs-crypt.h
@@ -20,7 +20,7 @@
 #ifndef OGS_CRYPT_H
 #define OGS_CRYPT_H
 
-#include "ogs-proto.h"
+#include "proto/ogs-proto.h"
 
 #define OGS_CRYPT_INSIDE
 
diff --git a/lib/dbi/ogs-dbi.h b/lib/dbi/ogs-dbi.h
index f5e7818a3..66e1b6c3c 100644
--- a/lib/dbi/ogs-dbi.h
+++ b/lib/dbi/ogs-dbi.h
@@ -20,8 +20,7 @@
 #ifndef OGS_DBI_H
 #define OGS_DBI_H
 
-#include "ogs-core.h"
-#include "ogs-crypt.h"
+#include "crypt/ogs-crypt.h"
 
 #define OGS_DBI_INSIDE
 
diff --git a/lib/diameter/common/meson.build b/lib/diameter/common/meson.build
index 3b6b6d93b..38528db72 100644
--- a/lib/diameter/common/meson.build
+++ b/lib/diameter/common/meson.build
@@ -51,10 +51,10 @@ libdiameter_common = library('ogsdiameter-common',
     version : libogslib_version,
     c_args : libdiameter_common_cc_flags,
     include_directories : [libdiameter_common_inc, libinc],
-    dependencies : [libproto_dep, libfdcore_dep],
+    dependencies : [libcore_dep, libfdcore_dep],
     install : true)
 
 libdiameter_common_dep = declare_dependency(
     link_with : libdiameter_common,
     include_directories : [libdiameter_common_inc, libinc],
-    dependencies : [libproto_dep, libfdcore_dep])
+    dependencies : [libcore_dep, libfdcore_dep])
diff --git a/lib/diameter/common/ogs-diameter-common.h b/lib/diameter/common/ogs-diameter-common.h
index 4fd7e3b02..b05bf0f5f 100644
--- a/lib/diameter/common/ogs-diameter-common.h
+++ b/lib/diameter/common/ogs-diameter-common.h
@@ -37,7 +37,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "ogs-proto.h"
+#include "proto/ogs-proto.h"
 
 #define OGS_DIAMETER_INSIDE
 
diff --git a/lib/gtp/meson.build b/lib/gtp/meson.build
index db645f9b1..c4d98cde7 100644
--- a/lib/gtp/meson.build
+++ b/lib/gtp/meson.build
@@ -56,10 +56,10 @@ libgtp = library('ogsgtp',
     version : libogslib_version,
     c_args : '-DOGS_GTP_COMPILATION',
     include_directories : [libgtp_inc, libinc],
-    dependencies : [libcore_dep, libapp_dep, libnas_common_dep],
+    dependencies : [libproto_dep, libipfw_dep, libapp_dep],
     install : true)
 
 libgtp_dep = declare_dependency(
     link_with : libgtp,
     include_directories : [libgtp_inc, libinc],
-    dependencies : [libcore_dep, libapp_dep, libnas_common_dep])
+    dependencies : [libproto_dep, libipfw_dep, libapp_dep])
diff --git a/lib/gtp/ogs-gtp.h b/lib/gtp/ogs-gtp.h
index 9d0662a00..7d9b15d59 100644
--- a/lib/gtp/ogs-gtp.h
+++ b/lib/gtp/ogs-gtp.h
@@ -20,10 +20,9 @@
 #ifndef OGS_GTP_H
 #define OGS_GTP_H
 
-#include "ogs-core.h"
 #include "ipfw/ogs-ipfw.h"
-#include "ogs-app.h"
-#include "ogs-nas-common.h"
+#include "proto/ogs-proto.h"
+#include "app/ogs-app.h"
 
 #define OGS_GTPV1_U_UDP_PORT            2152
 #define OGS_GTPV2_C_UDP_PORT            2123
diff --git a/lib/ipfw/meson.build b/lib/ipfw/meson.build
index 95cea39b9..990972764 100644
--- a/lib/ipfw/meson.build
+++ b/lib/ipfw/meson.build
@@ -80,10 +80,10 @@ libipfw = library('ogsipfw',
     version : libogslib_version,
     c_args : ['-include', 'glue.h', ipfw_cc_flags],
     include_directories : libipfw_inc,
-    dependencies : libproto_dep,
+    dependencies : libcore_dep,
     install : true)
 
 libipfw_dep = declare_dependency(
     link_with : libipfw,
     include_directories : libinc,
-    dependencies : libproto_dep)
+    dependencies : libcore_dep)
diff --git a/lib/ipfw/ogs-ipfw.h b/lib/ipfw/ogs-ipfw.h
index ef591f5c1..775d8594b 100644
--- a/lib/ipfw/ogs-ipfw.h
+++ b/lib/ipfw/ogs-ipfw.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-#include "ogs-proto.h"
+#include "proto/ogs-proto.h"
 
 typedef struct ogs_ipfw_rule_s {
     uint8_t proto;
diff --git a/lib/metrics/meson.build b/lib/metrics/meson.build
index ca210b6ac..fbb8fd93f 100644
--- a/lib/metrics/meson.build
+++ b/lib/metrics/meson.build
@@ -20,7 +20,7 @@ libmetrics_file_list = '''
     context.h
     context.c
 '''
-libmetrics_dependencies = [libcore_dep, libapp_dep]
+libmetrics_dependencies = [libapp_dep]
 
 
 metrics_impl_optval = get_option('metrics_impl')
diff --git a/lib/metrics/ogs-metrics.h b/lib/metrics/ogs-metrics.h
index aec696f7a..7d1117d3c 100644
--- a/lib/metrics/ogs-metrics.h
+++ b/lib/metrics/ogs-metrics.h
@@ -20,8 +20,7 @@
 #ifndef OGS_METRICS_H
 #define OGS_METRICS_H
 
-#include "ogs-core.h"
-#include "ogs-app.h"
+#include "app/ogs-app.h"
 
 #define OGS_METRICS_INSIDE
 
diff --git a/lib/nas/common/meson.build b/lib/nas/common/meson.build
index 6c3aaccd3..46781fa8b 100644
--- a/lib/nas/common/meson.build
+++ b/lib/nas/common/meson.build
@@ -28,10 +28,10 @@ libnas_common = library('ogsnas-common',
     version : libogslib_version,
     c_args : '-DOGS_NAS_COMPILATION',
     include_directories : [libnas_common_inc, libcrypt_inc, libinc],
-    dependencies : [libcore_dep, libcrypt_dep],
+    dependencies : libcrypt_dep,
     install : true)
 
 libnas_common_dep = declare_dependency(
     link_with : libnas_common,
     include_directories : [libnas_common_inc, libcrypt_inc, libinc],
-    dependencies : [libcore_dep, libcrypt_dep])
+    dependencies : libcrypt_dep)
diff --git a/lib/nas/common/ogs-nas-common.h b/lib/nas/common/ogs-nas-common.h
index 245e09d6b..6b85aa4d6 100644
--- a/lib/nas/common/ogs-nas-common.h
+++ b/lib/nas/common/ogs-nas-common.h
@@ -20,8 +20,7 @@
 #ifndef OGS_NAS_COMMON_H
 #define OGS_NAS_COMMON_H
 
-#include "ogs-core.h"
-#include "ogs-crypt.h"
+#include "crypt/ogs-crypt.h"
 
 #define OGS_NAS_INSIDE
 
diff --git a/lib/ngap/ogs-ngap.h b/lib/ngap/ogs-ngap.h
index f8ea0710c..f3f48908b 100644
--- a/lib/ngap/ogs-ngap.h
+++ b/lib/ngap/ogs-ngap.h
@@ -20,7 +20,7 @@
 #ifndef OGS_NGAP_H
 #define OGS_NGAP_H
 
-#include "ogs-core.h"
+#include "core/ogs-core.h"
 
 #include "NGAP_AdditionalDLUPTNLInformationForHOItem.h"
 #include "NGAP_AdditionalDLUPTNLInformationForHOList.h"
diff --git a/lib/pfcp/meson.build b/lib/pfcp/meson.build
index fdec3fa93..910b50828 100644
--- a/lib/pfcp/meson.build
+++ b/lib/pfcp/meson.build
@@ -64,11 +64,11 @@ libpfcp = library('ogspfcp',
     version : libogslib_version,
     c_args : '-DOGS_PFCP_COMPILATION',
     include_directories : [libpfcp_inc, libinc],
-    dependencies : [libcore_dep, libipfw_dep, libapp_dep, libgtp_dep],
+    dependencies : libgtp_dep,
     install_rpath : libdir,
     install : true)
 
 libpfcp_dep = declare_dependency(
     link_with : libpfcp,
     include_directories : [libpfcp_inc, libinc],
-    dependencies : [libcore_dep, libipfw_dep, libapp_dep, libgtp_dep])
+    dependencies : libgtp_dep)
diff --git a/lib/pfcp/ogs-pfcp.h b/lib/pfcp/ogs-pfcp.h
index 9f631b708..7403ba80d 100644
--- a/lib/pfcp/ogs-pfcp.h
+++ b/lib/pfcp/ogs-pfcp.h
@@ -20,13 +20,9 @@
 #ifndef OGS_PFCP_H
 #define OGS_PFCP_H
 
-#include "ogs-core.h"
-
 #include "pfcp/pfcp-config.h"
 
-#include "ipfw/ogs-ipfw.h"
-#include "ogs-app.h"
-#include "ogs-gtp.h"
+#include "gtp/ogs-gtp.h"
 
 #define OGS_PFCP_UDP_PORT               8805
 
diff --git a/lib/proto/ogs-proto.h b/lib/proto/ogs-proto.h
index 25bae395e..d99f02f28 100644
--- a/lib/proto/ogs-proto.h
+++ b/lib/proto/ogs-proto.h
@@ -20,7 +20,7 @@
 #ifndef OGS_PROTO_H
 #define OGS_PROTO_H
 
-#include "ogs-core.h"
+#include "core/ogs-core.h"
 
 #define OGS_PROTO_INSIDE
 
diff --git a/lib/s1ap/ogs-s1ap.h b/lib/s1ap/ogs-s1ap.h
index 2f76b882d..b29f4eeb9 100644
--- a/lib/s1ap/ogs-s1ap.h
+++ b/lib/s1ap/ogs-s1ap.h
@@ -20,7 +20,7 @@
 #ifndef OGS_S1AP_H
 #define OGS_S1AP_H
 
-#include "ogs-core.h"
+#include "core/ogs-core.h"
 
 #include "S1AP_Additional-GUTI.h"
 #include "S1AP_AdditionalCSFallbackIndicator.h"
diff --git a/lib/sbi/client.c b/lib/sbi/client.c
index e46ff733f..b2af72783 100644
--- a/lib/sbi/client.c
+++ b/lib/sbi/client.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ogs-app.h"
 #include "ogs-sbi.h"
 
 #include "curl/curl.h"
diff --git a/lib/sbi/context.c b/lib/sbi/context.c
index fb0b24bc1..e91f4811b 100644
--- a/lib/sbi/context.c
+++ b/lib/sbi/context.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ogs-app.h"
 #include "ogs-sbi.h"
 
 int __ogs_sbi_domain;
diff --git a/lib/sbi/message.c b/lib/sbi/message.c
index ff3cf675d..1f052364e 100644
--- a/lib/sbi/message.c
+++ b/lib/sbi/message.c
@@ -18,7 +18,6 @@
  */
 
 #include "ogs-sbi.h"
-#include "ogs-crypt.h"
 #include "yuarel.h"
 
 #include "contrib/multipart_parser.h"
diff --git a/lib/sbi/mhd-server.c b/lib/sbi/mhd-server.c
index 5cd84c55e..6ce154263 100644
--- a/lib/sbi/mhd-server.c
+++ b/lib/sbi/mhd-server.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ogs-app.h"
 #include "ogs-sbi.h"
 
 #include "microhttpd.h"
diff --git a/lib/sbi/nf-sm.c b/lib/sbi/nf-sm.c
index 1da972189..8f552598d 100644
--- a/lib/sbi/nf-sm.c
+++ b/lib/sbi/nf-sm.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ogs-app.h"
 #include "ogs-sbi.h"
 
 void ogs_sbi_nf_fsm_init(ogs_sbi_nf_instance_t *nf_instance)
diff --git a/lib/sbi/nghttp2-server.c b/lib/sbi/nghttp2-server.c
index f2c110a43..7272ac44e 100644
--- a/lib/sbi/nghttp2-server.c
+++ b/lib/sbi/nghttp2-server.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ogs-app.h"
 #include "ogs-sbi.h"
 #include "yuarel.h"
 
diff --git a/lib/sbi/nnrf-build.c b/lib/sbi/nnrf-build.c
index 6952b25da..a0a5c1160 100644
--- a/lib/sbi/nnrf-build.c
+++ b/lib/sbi/nnrf-build.c
@@ -18,7 +18,6 @@
  */
 
 #include "ogs-sbi.h"
-#include "ogs-app.h"
 
 OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile(void)
 {
diff --git a/lib/sbi/nnrf-handler.c b/lib/sbi/nnrf-handler.c
index 68907c162..31d3d0a64 100644
--- a/lib/sbi/nnrf-handler.c
+++ b/lib/sbi/nnrf-handler.c
@@ -18,7 +18,6 @@
  */
 
 #include "ogs-sbi.h"
-#include "ogs-app.h"
 
 static void handle_smf_info(
         ogs_sbi_nf_instance_t *nf_instance, OpenAPI_smf_info_t *SmfInfo);
diff --git a/lib/sbi/ogs-sbi.h b/lib/sbi/ogs-sbi.h
index 12800fa4b..d90d16ab6 100644
--- a/lib/sbi/ogs-sbi.h
+++ b/lib/sbi/ogs-sbi.h
@@ -20,7 +20,8 @@
 #ifndef OGS_SBI_H
 #define OGS_SBI_H
 
-#include "ogs-proto.h"
+#include "crypt/ogs-crypt.h"
+#include "app/ogs-app.h"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
diff --git a/lib/sbi/path.c b/lib/sbi/path.c
index 5a8305556..3c0b80bfb 100644
--- a/lib/sbi/path.c
+++ b/lib/sbi/path.c
@@ -18,7 +18,6 @@
  */
 
 #include "ogs-sbi.h"
-#include "ogs-app.h"
 
 bool ogs_sbi_send_request(ogs_sbi_nf_instance_t *nf_instance,
         ogs_sbi_client_cb_f client_cb, ogs_sbi_xact_t *xact)
diff --git a/lib/sbi/server.c b/lib/sbi/server.c
index f97e785f6..79789d0c9 100644
--- a/lib/sbi/server.c
+++ b/lib/sbi/server.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ogs-app.h"
 #include "ogs-sbi.h"
 
 extern const ogs_sbi_server_actions_t ogs_mhd_server_actions;
diff --git a/lib/sbi/timer.c b/lib/sbi/timer.c
index 749627c3e..6b513a358 100644
--- a/lib/sbi/timer.c
+++ b/lib/sbi/timer.c
@@ -18,7 +18,6 @@
  */
 
 #include "ogs-sbi.h"
-#include "ogs-app.h"
 
 static void timer_send_event(int timer_id, void *data)
 {
diff --git a/lib/sctp/ogs-sctp.h b/lib/sctp/ogs-sctp.h
index d34d519b4..3384a98df 100644
--- a/lib/sctp/ogs-sctp.h
+++ b/lib/sctp/ogs-sctp.h
@@ -20,7 +20,7 @@
 #ifndef OGS_SCTP_H
 #define OGS_SCTP_H
 
-#include "ogs-app.h"
+#include "app/ogs-app.h"
 
 #include "sctp/sctp-config.h"
 
diff --git a/lib/tun/ogs-tun.h b/lib/tun/ogs-tun.h
index df7386865..12c2c37e1 100644
--- a/lib/tun/ogs-tun.h
+++ b/lib/tun/ogs-tun.h
@@ -20,7 +20,7 @@
 #ifndef OGS_TUN_H
 #define OGS_TUN_H
 
-#include "ogs-proto.h"
+#include "proto/ogs-proto.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/amf/meson.build b/src/amf/meson.build
index d954625aa..3ec5041e5 100644
--- a/src/amf/meson.build
+++ b/src/amf/meson.build
@@ -64,8 +64,7 @@ libamf_sources = files('''
 
 libamf = static_library('amf',
     sources : libamf_sources,
-    dependencies : [libapp_dep,
-                    libmetrics_dep,
+    dependencies : [libmetrics_dep,
                     libsctp_dep,
                     libngap_dep,
                     libnas_5gs_dep,
@@ -74,8 +73,7 @@ libamf = static_library('amf',
 
 libamf_dep = declare_dependency(
     link_with : libamf,
-    dependencies : [libapp_dep,
-                    libmetrics_dep,
+    dependencies : [libmetrics_dep,
                     libsctp_dep,
                     libngap_dep,
                     libnas_5gs_dep,
diff --git a/src/ausf/meson.build b/src/ausf/meson.build
index 1378b9e2a..b8d75917e 100644
--- a/src/ausf/meson.build
+++ b/src/ausf/meson.build
@@ -34,15 +34,13 @@ libausf_sources = files('''
 
 libausf = static_library('ausf',
     sources : libausf_sources,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
+    dependencies : [libcrypt_dep,
                     libsbi_dep],
     install : false)
 
 libausf_dep = declare_dependency(
     link_with : libausf,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
+    dependencies : [libcrypt_dep,
                     libsbi_dep])
 
 ausf_sources = files('''
diff --git a/src/bsf/meson.build b/src/bsf/meson.build
index 24ae8340e..619d9e8eb 100644
--- a/src/bsf/meson.build
+++ b/src/bsf/meson.build
@@ -30,15 +30,13 @@ libbsf_sources = files('''
 
 libbsf = static_library('bsf',
     sources : libbsf_sources,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
+    dependencies : [libcrypt_dep,
                     libsbi_dep],
     install : false)
 
 libbsf_dep = declare_dependency(
     link_with : libbsf,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
+    dependencies : [libcrypt_dep,
                     libsbi_dep])
 
 bsf_sources = files('''
diff --git a/src/hss/meson.build b/src/hss/meson.build
index d80707dcc..1cae23fcf 100644
--- a/src/hss/meson.build
+++ b/src/hss/meson.build
@@ -32,7 +32,6 @@ libhss_sources = files('''
 libhss = static_library('hss',
     sources : libhss_sources,
     dependencies : [libapp_dep,
-                    libcrypt_dep,
                     libdbi_dep,
                     libdiameter_s6a_dep,
                     libdiameter_cx_dep,
@@ -42,7 +41,6 @@ libhss = static_library('hss',
 libhss_dep = declare_dependency(
     link_with : libhss,
     dependencies : [libapp_dep,
-                    libcrypt_dep,
                     libdbi_dep,
                     libdiameter_s6a_dep,
                     libdiameter_cx_dep,
diff --git a/src/mme/meson.build b/src/mme/meson.build
index 1f3d5a238..1a9bd35c7 100644
--- a/src/mme/meson.build
+++ b/src/mme/meson.build
@@ -79,8 +79,7 @@ libmme_sources = files('''
 
 libmme = static_library('mme',
     sources : libmme_sources,
-    dependencies : [libapp_dep,
-                    libmetrics_dep,
+    dependencies : [libmetrics_dep,
                     libsctp_dep,
                     libs1ap_dep,
                     libnas_eps_dep,
@@ -90,8 +89,7 @@ libmme = static_library('mme',
 
 libmme_dep = declare_dependency(
     link_with : libmme,
-    dependencies : [libapp_dep,
-                    libmetrics_dep,
+    dependencies : [libmetrics_dep,
                     libsctp_dep,
                     libs1ap_dep,
                     libnas_eps_dep,
diff --git a/src/nrf/context.c b/src/nrf/context.c
index a43d3947c..943c63f5f 100644
--- a/src/nrf/context.c
+++ b/src/nrf/context.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ogs-dbi.h"
 #include "context.h"
 
 static nrf_context_t self;
@@ -33,7 +32,6 @@ void nrf_context_init(void)
     /* Initialize NRF context */
     memset(&self, 0, sizeof(nrf_context_t));
 
-    ogs_log_install_domain(&__ogs_dbi_domain, "dbi", ogs_core()->log.level);
     ogs_log_install_domain(&__nrf_log_domain, "nrf", ogs_core()->log.level);
 
     context_initialized = 1;
diff --git a/src/nrf/meson.build b/src/nrf/meson.build
index 72bda8239..342592a23 100644
--- a/src/nrf/meson.build
+++ b/src/nrf/meson.build
@@ -32,16 +32,12 @@ libnrf_sources = files('''
 
 libnrf = static_library('nrf',
     sources : libnrf_sources,
-    dependencies : [libapp_dep,
-                    libdbi_dep,
-                    libsbi_dep],
+    dependencies : libsbi_dep,
     install : false)
 
 libnrf_dep = declare_dependency(
     link_with : libnrf,
-    dependencies : [libapp_dep,
-                    libdbi_dep,
-                    libsbi_dep])
+    dependencies : libsbi_dep)
 
 nrf_sources = files('''
     app.c
diff --git a/src/nssf/meson.build b/src/nssf/meson.build
index bedf6c758..b3767fd64 100644
--- a/src/nssf/meson.build
+++ b/src/nssf/meson.build
@@ -29,14 +29,12 @@ libnssf_sources = files('''
 
 libnssf = static_library('nssf',
     sources : libnssf_sources,
-    dependencies : [libapp_dep,
-                    libsbi_dep],
+    dependencies : libsbi_dep,
     install : false)
 
 libnssf_dep = declare_dependency(
     link_with : libnssf,
-    dependencies : [libapp_dep,
-                    libsbi_dep])
+    dependencies : libsbi_dep)
 
 nssf_sources = files('''
     app.c
diff --git a/src/pcf/meson.build b/src/pcf/meson.build
index 5b1c13ba4..cd9b1bf0e 100644
--- a/src/pcf/meson.build
+++ b/src/pcf/meson.build
@@ -43,17 +43,13 @@ libpcf_sources = files('''
 
 libpcf = static_library('pcf',
     sources : libpcf_sources,
-    dependencies : [libcrypt_dep,
-                    libapp_dep,
-                    libdbi_dep,
+    dependencies : [libdbi_dep,
                     libsbi_dep],
     install : false)
 
 libpcf_dep = declare_dependency(
     link_with : libpcf,
-    dependencies : [libcrypt_dep,
-                    libapp_dep,
-                    libdbi_dep,
+    dependencies : [libdbi_dep,
                     libsbi_dep])
 
 pcf_sources = files('''
diff --git a/src/scp/meson.build b/src/scp/meson.build
index aa41e197e..7ff874271 100644
--- a/src/scp/meson.build
+++ b/src/scp/meson.build
@@ -30,15 +30,13 @@ libscp_sources = files('''
 
 libscp = static_library('scp',
     sources : libscp_sources,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
+    dependencies : [libcrypt_dep,
                     libsbi_dep],
     install : false)
 
 libscp_dep = declare_dependency(
     link_with : libscp,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
+    dependencies : [libcrypt_dep,
                     libsbi_dep])
 
 scp_sources = files('''
diff --git a/src/sgwc/meson.build b/src/sgwc/meson.build
index d0942a73b..41c4a5de7 100644
--- a/src/sgwc/meson.build
+++ b/src/sgwc/meson.build
@@ -45,16 +45,12 @@ libsgwc_sources = files('''
 
 libsgwc = static_library('sgwc',
     sources : libsgwc_sources,
-    dependencies : [libapp_dep,
-                    libgtp_dep,
-                    libpfcp_dep],
+    dependencies : libpfcp_dep,
     install : false)
 
 libsgwc_dep = declare_dependency(
     link_with : libsgwc,
-    dependencies : [libapp_dep,
-                    libgtp_dep,
-                    libpfcp_dep])
+    dependencies : libpfcp_dep)
 
 sgwc_sources = files('''
     app.c
diff --git a/src/sgwu/meson.build b/src/sgwu/meson.build
index 270c101e3..6ef85c1b6 100644
--- a/src/sgwu/meson.build
+++ b/src/sgwu/meson.build
@@ -39,16 +39,12 @@ libsgwu_sources = files('''
 
 libsgwu = static_library('sgwu',
     sources : libsgwu_sources,
-    dependencies : [libapp_dep,
-                    libgtp_dep,
-                    libpfcp_dep],
+    dependencies : libpfcp_dep,
     install : false)
 
 libsgwu_dep = declare_dependency(
     link_with : libsgwu,
-    dependencies : [libapp_dep,
-                    libgtp_dep,
-                    libpfcp_dep])
+    dependencies : libpfcp_dep)
 
 sgwu_sources = files('''
     app.c
diff --git a/src/smf/meson.build b/src/smf/meson.build
index ee8419e2f..12599f3bc 100644
--- a/src/smf/meson.build
+++ b/src/smf/meson.build
@@ -110,29 +110,25 @@ libsmf_sources = files('''
 
 libsmf = static_library('smf',
     sources : libsmf_sources,
-    dependencies : [libapp_dep,
-                    libmetrics_dep,
+    dependencies : [libmetrics_dep,
                     libsbi_dep,
                     libngap_dep,
                     libnas_5gs_dep,
                     libdiameter_gx_dep,
                     libdiameter_gy_dep,
                     libdiameter_s6b_dep,
-                    libgtp_dep,
                     libpfcp_dep],
     install : false)
 
 libsmf_dep = declare_dependency(
     link_with : libsmf,
-    dependencies : [libapp_dep,
-                    libmetrics_dep,
+    dependencies : [libmetrics_dep,
                     libsbi_dep,
                     libngap_dep,
                     libnas_5gs_dep,
                     libdiameter_gx_dep,
                     libdiameter_gy_dep,
                     libdiameter_s6b_dep,
-                    libgtp_dep,
                     libpfcp_dep])
 
 smf_sources = files('''
diff --git a/src/udm/meson.build b/src/udm/meson.build
index a2cce842c..f1418f8c9 100644
--- a/src/udm/meson.build
+++ b/src/udm/meson.build
@@ -34,16 +34,12 @@ libudm_sources = files('''
 
 libudm = static_library('udm',
     sources : libudm_sources,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
-                    libsbi_dep],
+    dependencies : libsbi_dep,
     install : false)
 
 libudm_dep = declare_dependency(
     link_with : libudm,
-    dependencies : [libapp_dep,
-                    libcrypt_dep,
-                    libsbi_dep])
+    dependencies : libsbi_dep)
 
 udm_sources = files('''
     app.c
diff --git a/src/udr/meson.build b/src/udr/meson.build
index f75e7802a..ed8869f05 100644
--- a/src/udr/meson.build
+++ b/src/udr/meson.build
@@ -29,15 +29,13 @@ libudr_sources = files('''
 
 libudr = static_library('udr',
     sources : libudr_sources,
-    dependencies : [libapp_dep,
-                    libdbi_dep,
+    dependencies : [libdbi_dep,
                     libsbi_dep],
     install : false)
 
 libudr_dep = declare_dependency(
     link_with : libudr,
-    dependencies : [libapp_dep,
-                    libdbi_dep,
+    dependencies : [libdbi_dep,
                     libsbi_dep])
 
 udr_sources = files('''
diff --git a/src/upf/meson.build b/src/upf/meson.build
index b2cc2526a..c84bf1f0b 100644
--- a/src/upf/meson.build
+++ b/src/upf/meson.build
@@ -86,8 +86,6 @@ libarp_nd_dep = declare_dependency(
 libupf = static_library('upf',
     sources : libupf_sources,
     dependencies : [
-        libapp_dep,
-        libgtp_dep,
         libpfcp_dep,
         libtun_dep,
         libarp_nd_dep,
@@ -97,8 +95,6 @@ libupf = static_library('upf',
 libupf_dep = declare_dependency(
     link_with : libupf,
     dependencies : [
-        libapp_dep,
-        libgtp_dep,
         libpfcp_dep,
         libtun_dep,
         libarp_nd_dep,