diff --git a/src/hss/hss-fd-path.c b/src/hss/hss-fd-path.c
index 5c9faba3e3..21fc9ff367 100644
--- a/src/hss/hss-fd-path.c
+++ b/src/hss/hss-fd-path.c
@@ -756,13 +756,14 @@ int hss_fd_init(void)
 {
     int ret;
 	struct disp_when data;
-    struct dict_object * s6a_app, * vnd;
+    struct dict_object *s6a_app, *vnd;
+    struct dict_vendor_data vnd_data;
+    struct dict_application_data s6a_app_data;
 
     ret = ogs_diam_init(FD_MODE_SERVER,
                 hss_self()->diam_conf_path, hss_self()->diam_config);
     ogs_assert(ret == 0);
 
-    struct dict_vendor_data vnd_data;
     vnd_data.vendor_id = 10415;
     vnd_data.vendor_name = (char *) "3GPP";
 
@@ -770,8 +771,6 @@ int hss_fd_init(void)
             DICT_VENDOR, &vnd_data, NULL, &vnd);
     ogs_assert(ret == 0);
 
-    struct dict_application_data s6a_app_data;
-
     s6a_app_data.application_id = 16777251;
     s6a_app_data.application_name = (char *) "S6A";
 
diff --git a/src/mme/mme-fd-path.c b/src/mme/mme-fd-path.c
index f786085a73..3e8974697d 100644
--- a/src/mme/mme-fd-path.c
+++ b/src/mme/mme-fd-path.c
@@ -1139,13 +1139,14 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
 int mme_fd_init(void)
 {
     int ret;
-    struct dict_object * s6a_app, * vnd;
+    struct dict_object *s6a_app, *vnd;
+    struct dict_vendor_data vnd_data;
+    struct dict_application_data s6a_app_data;
 
     ret = ogs_diam_init(FD_MODE_CLIENT,
                 mme_self()->diam_conf_path, mme_self()->diam_config);
     ogs_assert(ret == OGS_OK);
 
-    struct dict_vendor_data vnd_data;
     vnd_data.vendor_id = 10415;
     vnd_data.vendor_name = (char *) "3GPP";
 
@@ -1153,8 +1154,6 @@ int mme_fd_init(void)
             DICT_VENDOR, &vnd_data, NULL, &vnd);
     ogs_assert(ret == 0);
 
-    struct dict_application_data s6a_app_data;
-
     s6a_app_data.application_id = 16777251;
     s6a_app_data.application_name = (char *) "S6A";
 
diff --git a/src/pcrf/pcrf-fd-path.c b/src/pcrf/pcrf-fd-path.c
index af8392fa0c..1a7d349622 100644
--- a/src/pcrf/pcrf-fd-path.c
+++ b/src/pcrf/pcrf-fd-path.c
@@ -23,13 +23,14 @@
 int pcrf_fd_init(void)
 {
     int rv, ret;
-    struct dict_object * gx_app, * rx_app, * vnd;
+    struct dict_object *gx_app, *rx_app, *vnd;
+    struct dict_vendor_data vnd_data;
+    struct dict_application_data gx_app_data, rx_app_data;
 
     ret = ogs_diam_init(FD_MODE_CLIENT|FD_MODE_SERVER,
                 pcrf_self()->diam_conf_path, pcrf_self()->diam_config);
     ogs_assert(ret == 0);
 
-    struct dict_vendor_data vnd_data;
     vnd_data.vendor_id = 10415;
     vnd_data.vendor_name = (char *) "3GPP";
 
@@ -37,8 +38,6 @@ int pcrf_fd_init(void)
             DICT_VENDOR, &vnd_data, NULL, &vnd);
     ogs_assert(ret == 0);
 
-    struct dict_application_data gx_app_data, rx_app_data;
-
     gx_app_data.application_id = 16777238;
     gx_app_data.application_name = (char *) "Gx";
 
diff --git a/src/smf/fd-path.c b/src/smf/fd-path.c
index 36d15387ce..211e51accb 100644
--- a/src/smf/fd-path.c
+++ b/src/smf/fd-path.c
@@ -1043,7 +1043,9 @@ int smf_fd_init(void)
 {
     int ret;
 	struct disp_when data;
-    struct dict_object * gx_app, * vnd;
+    struct dict_object *gx_app, *vnd;
+    struct dict_vendor_data vnd_data;
+    struct dict_application_data gx_app_data;
 
     if (smf_self()->diam_conf_path == NULL &&
         (smf_self()->diam_config->cnf_diamid == NULL ||
@@ -1060,7 +1062,6 @@ int smf_fd_init(void)
                 smf_self()->diam_conf_path, smf_self()->diam_config);
     ogs_assert(ret == 0);
 
-    struct dict_vendor_data vnd_data;
     vnd_data.vendor_id = 10415;
     vnd_data.vendor_name = (char *) "3GPP";
 
@@ -1068,8 +1069,6 @@ int smf_fd_init(void)
             DICT_VENDOR, &vnd_data, NULL, &vnd);
     ogs_assert(ret == 0);
 
-    struct dict_application_data gx_app_data;
-
     gx_app_data.application_id = 16777238;
     gx_app_data.application_name = (char *) "Gx";