Header Refactoring

lib/nas/Makefile.am

@@ -21,7 +21,6 @@ AM_LDFLAGS = \
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
 	$(NULL)
 
 AM_CFLAGS = \

lib/s1ap/Makefile.am

@@ -22,7 +22,6 @@ AM_LDFLAGS = \
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
     -I$(top_srcdir)/lib/s1ap/asn1c
 
 AM_CFLAGS = \

src/Makefile.am

@@ -42,7 +42,7 @@ libepc_la_LIBADD = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-	-I$(top_srcdir)/src/app \
+	-I$(top_srcdir)/src \
 	$(NULL)
 
 AM_CFLAGS = \

src/epc.c

@@ -4,8 +4,8 @@
 #include "core_debug.h"
 #include "core_semaphore.h"
 
-#include "context.h"
-#include "app.h"
+#include "app/context.h"
+#include "app/app.h"
 
 static semaphore_id pcrf_sem1 = 0;
 static semaphore_id pcrf_sem2 = 0;

src/hss.c

@@ -4,8 +4,8 @@
 #include "core_signal.h"
 #include "core_semaphore.h"
 
-#include "context.h"
-#include "app.h"
+#include "app/context.h"
+#include "app/app.h"
 
 const char *app_name = "hss";
 

src/hss/Makefile.am

@@ -19,11 +19,9 @@ libhss_la_LIBADD = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
-    -I$(top_srcdir)/lib/fd/s6a \
-    -I$(top_srcdir)/lib/fd \
+    -I$(top_srcdir)/lib \
+	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-	-I$(top_srcdir)/src/app \
 	@MONGOC_CFLAGS@ \
 	$(NULL)
 

src/hss/hss_context.c

@@ -6,11 +6,11 @@
 
 #include <mongoc.h>
 #include <yaml.h>
-#include "yaml_helper.h"
+#include "app/yaml_helper.h"
 
-#include "fd_lib.h"
+#include "fd/fd_lib.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "hss_context.h"
 
 static hss_context_t self;

src/hss/hss_context.h

@@ -4,7 +4,7 @@
 #include "core_errno.h"
 #include "core_mutex.h"
 
-#include "s6a_message.h"
+#include "fd/s6a/s6a_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/hss/hss_fd_path.c

@@ -5,9 +5,9 @@
 #include "core_sha2.h"
 #include "core_network.h"
 
-#include "fd_lib.h"
-#include "s6a_dict.h"
-#include "s6a_message.h"
+#include "fd/fd_lib.h"
+#include "fd/s6a/s6a_dict.h"
+#include "fd/s6a/s6a_message.h"
 
 #include "hss_context.h"
 #include "hss_kdf.h"

src/mme.c

@@ -4,8 +4,8 @@
 #include "core_signal.h"
 #include "core_semaphore.h"
 
-#include "context.h"
-#include "app.h"
+#include "app/context.h"
+#include "app/app.h"
 
 const char *app_name = "mme";
 

src/mme/Makefile.am

@@ -47,15 +47,10 @@ libmme_la_LIBADD = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
+    -I$(top_srcdir)/lib \
+	-I$(top_srcdir)/src \
     -I$(top_srcdir)/lib/s1ap/asn1c \
-    -I$(top_srcdir)/lib/s1ap \
-    -I$(top_srcdir)/lib/nas \
-    -I$(top_srcdir)/lib/fd/s6a \
-    -I$(top_srcdir)/lib/fd \
-    -I$(top_srcdir)/lib/gtp \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-	-I$(top_srcdir)/src/app \
 	@MONGOC_CFLAGS@ \
 	$(NULL)
 

src/mme/emm_build.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #include "nas_security.h"
 #include "mme_kdf.h"

src/mme/emm_handler.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_lib.h"
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #include "mme_event.h"
 

src/mme/emm_handler.h

@@ -1,7 +1,7 @@
 #ifndef __EMM_HANDLER_H__
 #define __EMM_HANDLER_H__
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #include "mme_context.h"
 

src/mme/emm_sm.c

@@ -2,9 +2,9 @@
 
 #include "core_debug.h"
 
-#include "nas_message.h"
-#include "fd_lib.h"
-#include "s6a_message.h"
+#include "nas/nas_message.h"
+#include "fd/fd_lib.h"
+#include "fd/s6a/s6a_message.h"
 
 #include "mme_event.h"
 #include "mme_kdf.h"

src/mme/esm_build.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_lib.h"
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #include "nas_security.h"
 #include "esm_build.h"

src/mme/esm_handler.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #include "mme_context.h"
 #include "nas_path.h"

src/mme/esm_handler.h

@@ -1,7 +1,7 @@
 #ifndef __ESM_HANDLER_H__
 #define __ESM_HANDLER_H__
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #include "mme_context.h"
 

src/mme/esm_sm.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #include "mme_event.h"
 #include "mme_sm.h"

src/mme/mme_context.c

@@ -9,15 +9,15 @@
 
 #include <mongoc.h>
 #include <yaml.h>
-#include "yaml_helper.h"
+#include "app/yaml_helper.h"
 
-#include "s1ap_message.h"
-#include "gtp_xact.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
-#include "fd_lib.h"
+#include "s1ap/s1ap_message.h"
+#include "gtp/gtp_xact.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
+#include "fd/fd_lib.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "nas_conv.h"
 #include "mme_context.h"
 #include "mme_event.h"

src/mme/mme_context.h

@@ -13,9 +13,9 @@
 #include "core_timer.h"
 
 #include "3gpp_types.h"
-#include "s1ap_message.h"
-#include "nas_message.h"
-#include "s6a_message.h"
+#include "s1ap/s1ap_message.h"
+#include "nas/nas_message.h"
+#include "fd/s6a/s6a_message.h"
 
 /* S1AP */
 #include "S1ap-Cause.h"

src/mme/mme_fd_path.c

@@ -4,9 +4,9 @@
 #include "core_pool.h"
 #include "core_lib.h"
 
-#include "fd_lib.h"
-#include "s6a_dict.h"
-#include "s6a_message.h"
+#include "fd/fd_lib.h"
+#include "fd/s6a/s6a_dict.h"
+#include "fd/s6a/s6a_message.h"
 
 #include "mme_event.h"
 #include "mme_fd_path.h"

src/mme/mme_gtp_path.c

@@ -2,9 +2,9 @@
 #include "core_debug.h"
 #include "core_pkbuf.h"
 
-#include "gtp_node.h"
-#include "gtp_path.h"
-#include "gtp_xact.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
+#include "gtp/gtp_xact.h"
 
 #include "mme_event.h"
 #include "mme_gtp_path.h"

src/mme/mme_init.c

@@ -5,7 +5,7 @@
 #include "core_msgq.h"
 #include "core_fsm.h"
 
-#include "gtp_xact.h"
+#include "gtp/gtp_xact.h"
 
 #include "mme_event.h"
 

src/mme/mme_kdf.h

@@ -3,7 +3,7 @@
 
 #include "core.h"
 
-#include "nas_ies.h"
+#include "nas/nas_ies.h"
 
 /* Algorithm Type Distinguishers */
 #define MME_KDF_NAS_ENC_ALG 0x01

src/mme/mme_s11_build.c

@@ -1,13 +1,13 @@
 #define TRACE_MODULE _mme_s11_build
 
 #include "core_debug.h"
-
-#include "gtp_types.h"
-#include "gtp_conv.h"
-#include "gtp_message.h"
-#include "gtp_node.h"
-
 #include "3gpp_types.h"
+
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_message.h"
+#include "gtp/gtp_node.h"
+
 #include "mme_context.h"
 
 #include "mme_s11_build.h"

src/mme/mme_s11_build.h

@@ -1,7 +1,7 @@
 #ifndef __MME_S11_BUILD_H__
 #define __MME_S11_BUILD_H__
 
-#include "gtp_message.h"
+#include "gtp/gtp_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/mme_s11_handler.c

@@ -2,9 +2,9 @@
 
 #include "core_debug.h"
 
-#include "gtp_types.h"
-#include "gtp_conv.h"
-#include "gtp_xact.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_xact.h"
 
 #include "mme_event.h"
 #include "mme_sm.h"

src/mme/mme_s11_handler.h

@@ -1,7 +1,7 @@
 #ifndef __MME_S11_HANDLER_H__
 #define __MME_S11_HANDLER_H__
 
-#include "gtp_message.h"
+#include "gtp/gtp_message.h"
 
 #include "mme_context.h"
 

src/mme/mme_s6a_handler.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "s6a_message.h"
+#include "fd/s6a/s6a_message.h"
 #include "nas_path.h"
 #include "s1ap_path.h"
 

src/mme/mme_s6a_handler.h

@@ -1,7 +1,7 @@
 #ifndef __MME_S6A_HANDLER_H__
 #define __MME_S6A_HANDLER_H__
 
-#include "s6a_message.h"
+#include "fd/s6a/s6a_message.h"
 #include "mme_context.h"
 
 #ifdef __cplusplus

src/mme/mme_sm.c

@@ -1,9 +1,10 @@
 #define TRACE_MODULE _mme_sm
 #include "core_debug.h"
 
-#include "s1ap_message.h"
-#include "nas_message.h"
-#include "gtp_xact.h"
+#include "s1ap/s1ap_message.h"
+#include "nas/nas_message.h"
+#include "gtp/gtp_xact.h"
+#include "fd/fd_lib.h"
 
 #include "mme_event.h"
 #include "mme_sm.h"
@@ -16,7 +17,6 @@
 #include "esm_handler.h"
 #include "mme_gtp_path.h"
 #include "mme_s11_handler.h"
-#include "fd_lib.h"
 #include "mme_fd_path.h"
 #include "mme_s6a_handler.h"
 

src/mme/nas_conv.h

@@ -1,7 +1,7 @@
 #ifndef __NAS_CONV_H__
 #define __NAS_CONV_H__
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/nas_security.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 #include "nas_security.h"
 
 status_t nas_security_encode(

src/mme/s1ap_build.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "s6a_message.h"
+#include "fd/s6a/s6a_message.h"
 
 #include "mme_context.h"
 

src/mme/s1ap_build.h

@@ -1,7 +1,7 @@
 #ifndef __S1AP_BUILD_H__
 #define __S1AP_BUILD_H__
 
-#include "s1ap_message.h"
+#include "s1ap/s1ap_message.h"
 #include "mme_context.h"
 
 #ifdef __cplusplus

src/mme/s1ap_conv.h

@@ -1,7 +1,7 @@
 #ifndef __S1AP_CONV_H__
 #define __S1AP_CONV_H__
 
-#include "s1ap_message.h"
+#include "s1ap/s1ap_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/s1ap_handler.h

@@ -1,8 +1,9 @@
 #ifndef __S1AP_HANDLER_H__
 #define __S1AP_HANDLER_H__
 
+#include "s1ap/s1ap_message.h"
+
 #include "mme_context.h"
-#include "s1ap_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/s1ap_path.h

@@ -4,7 +4,7 @@
 #include "core_pkbuf.h"
 
 #include "mme_context.h"
-#include "s1ap_message.h"
+#include "s1ap/s1ap_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mme/s1ap_sm.c

@@ -2,8 +2,8 @@
 
 #include "core_debug.h"
 
-#include "nas_message.h"
-#include "gtp_message.h"
+#include "nas/nas_message.h"
+#include "gtp/gtp_message.h"
 
 #include "s1ap_build.h"
 #include "s1ap_handler.h"

src/pcrf.c

@@ -4,8 +4,8 @@
 #include "core_signal.h"
 #include "core_semaphore.h"
 
-#include "context.h"
-#include "app.h"
+#include "app/context.h"
+#include "app/app.h"
 
 const char *app_name = "pcrf";
 

src/pcrf/Makefile.am

@@ -19,12 +19,9 @@ libpcrf_la_LIBADD = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
-    -I$(top_srcdir)/lib/fd/gx \
-    -I$(top_srcdir)/lib/fd/rx \
-    -I$(top_srcdir)/lib/fd \
+    -I$(top_srcdir)/lib \
+	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-	-I$(top_srcdir)/src/app \
 	@MONGOC_CFLAGS@ \
 	$(NULL)
 

src/pcrf/pcrf_context.c

@@ -6,11 +6,11 @@
 
 #include <mongoc.h>
 #include <yaml.h>
-#include "yaml_helper.h"
+#include "app/yaml_helper.h"
 
-#include "fd_lib.h"
+#include "fd/fd_lib.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "pcrf_context.h"
 
 static pcrf_context_t self;

src/pcrf/pcrf_context.h

@@ -5,7 +5,7 @@
 #include "core_mutex.h"
 
 #include "3gpp_types.h"
-#include "gx_message.h"
+#include "fd/gx/gx_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/pcrf/pcrf_fd_path.c

@@ -4,11 +4,11 @@
 #include "core_pkbuf.h"
 #include "core_lib.h"
 
-#include "fd_lib.h"
-#include "gx_dict.h"
-#include "gx_message.h"
-#include "rx_dict.h"
-#include "rx_message.h"
+#include "fd/fd_lib.h"
+#include "fd/gx/gx_dict.h"
+#include "fd/gx/gx_message.h"
+#include "fd/rx/rx_dict.h"
+#include "fd/rx/rx_message.h"
 
 #include "pcrf_context.h"
 

src/pgw.c

@@ -4,8 +4,8 @@
 #include "core_signal.h"
 #include "core_semaphore.h"
 
-#include "context.h"
-#include "app.h"
+#include "app/context.h"
+#include "app/app.h"
 
 const char *app_name = "pgw";
 

src/pgw/Makefile.am

@@ -29,13 +29,9 @@ libpgw_la_LIBADD = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
-    -I$(top_srcdir)/lib/fd/gx \
-    -I$(top_srcdir)/lib/fd \
-    -I$(top_srcdir)/lib/gtp \
+    -I$(top_srcdir)/lib \
+	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-    -I$(top_srcdir)/lib/ipfw \
-	-I$(top_srcdir)/src/app \
 	@MONGOC_CFLAGS@ \
 	$(NULL)
 

src/pgw/pgw_context.c

@@ -7,17 +7,17 @@
 
 #include <mongoc.h>
 #include <yaml.h>
-#include "yaml_helper.h"
+#include "app/yaml_helper.h"
 
-#include "gtp_types.h"
-#include "gtp_conv.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
-#include "gtp_xact.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
+#include "gtp/gtp_xact.h"
 
-#include "fd_lib.h"
+#include "fd/fd_lib.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "pgw_context.h"
 
 static pgw_context_t self;

src/pgw/pgw_context.h

@@ -9,8 +9,8 @@
 #include "core_msgq.h"
 #include "core_timer.h"
 
-#include "gtp_types.h"
-#include "gtp_message.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/pgw/pgw_fd_path.c

@@ -6,13 +6,13 @@
 #include "core_pool.h"
 #include "core_lib.h"
 
-#include "gtp_xact.h"
+#include "gtp/gtp_xact.h"
 
-#include "fd_lib.h"
-#include "gx_dict.h"
-#include "gx_message.h"
+#include "fd/fd_lib.h"
+#include "fd/gx/gx_dict.h"
+#include "fd/gx/gx_message.h"
 #if VOLTE_TEST
-#include "../rx/rx_dict.h"
+#include "fd/rx/rx_dict.h"
 #endif
 
 #include "pgw_event.h"

src/pgw/pgw_gtp_path.c

@@ -3,10 +3,10 @@
 #include "core_pkbuf.h"
 
 #include "3gpp_types.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "pgw_context.h"
 #include "pgw_event.h"
 #include "pgw_gtp_path.h"

src/pgw/pgw_gtp_path.h

@@ -1,7 +1,7 @@
 #ifndef __PGW_PATH_H__
 #define __PGW_PATH_H__
 
-#include "gtp_xact.h"
+#include "gtp/gtp_xact.h"
 
 #ifdef __cplusplus
 extern "C" {

src/pgw/pgw_gx_handler.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 
 #include "pgw_context.h"
-#include "gx_message.h"
+#include "fd/gx/gx_message.h"
 #include "pgw_gtp_path.h"
 #include "pgw_s5c_build.h"
 #include "pgw_ipfw.h"

src/pgw/pgw_gx_handler.h

@@ -1,7 +1,7 @@
 #ifndef __PGW_GX_HANDLER_H__
 #define __PGW_GX_HANDLER_H__
 
-#include "gtp_message.h"
+#include "gtp/gtp_message.h"
 
 #include "pgw_context.h"
 

src/pgw/pgw_init.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_thread.h"
 
-#include "gtp_xact.h"
+#include "gtp/gtp_xact.h"
 
 #include "pgw_context.h"
 #include "pgw_event.h"

src/pgw/pgw_ipfw.c

@@ -3,8 +3,8 @@
 #include "core_network.h"
 #include "pgw_ipfw.h"
 
-#include "ipfw2.h"
-#include "objs/include_e/netinet/ip_fw.h"
+#include "ipfw/ipfw2.h"
+#include "ipfw/objs/include_e/netinet/ip_fw.h"
 
 #define MAX_NUM_OF_TOKEN 32
 #define MAX_NUM_OF_RULE_BUFFER 1024

src/pgw/pgw_s5c_build.c

@@ -3,12 +3,12 @@
 #include "core_debug.h"
 
 #include "3gpp_types.h"
-#include "gtp_types.h"
-#include "gtp_conv.h"
-#include "gtp_message.h"
-#include "gx_message.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_message.h"
+#include "fd/gx/gx_message.h"
 
-#include "ipfw2.h"
+#include "ipfw/ipfw2.h"
 
 #include "pgw_context.h"
 

src/pgw/pgw_s5c_build.h

@@ -1,7 +1,7 @@
 #ifndef __PGW_S5C_BUILD_H__
 #define __PGW_S5C_BUILD_H__
 
-#include "gtp_message.h"
+#include "gtp/gtp_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/pgw/pgw_s5c_handler.c

@@ -3,11 +3,11 @@
 #include "core_debug.h"
 #include "core_lib.h"
 
-#include "gtp_types.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "pgw_event.h"
 #include "pgw_context.h"
 #include "pgw_gtp_path.h"

src/pgw/pgw_s5c_handler.h

@@ -1,7 +1,7 @@
 #ifndef __PGW_S5C_HANDLER_H__
 #define __PGW_S5C_HANDLER_H__
 
-#include "gtp_message.h"
+#include "gtp/gtp_message.h"
 
 #include "pgw_context.h"
 

src/pgw/pgw_sm.c

@@ -3,9 +3,9 @@
 #include "core_debug.h"
 #include "core_lib.h"
 
-#include "gtp_node.h"
-#include "fd_lib.h"
-#include "gx_message.h"
+#include "gtp/gtp_node.h"
+#include "fd/fd_lib.h"
+#include "fd/gx/gx_message.h"
 
 #include "pgw_sm.h"
 #include "pgw_context.h"

src/sgw.c

@@ -4,8 +4,8 @@
 #include "core_signal.h"
 #include "core_semaphore.h"
 
-#include "context.h"
-#include "app.h"
+#include "app/context.h"
+#include "app/app.h"
 
 const char *app_name = "sgw";
 

src/sgw/Makefile.am

@@ -21,9 +21,8 @@ libsgw_la_LIBADD = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
-    -I$(top_srcdir)/lib/gtp \
-	-I$(top_srcdir)/src/app \
+    -I$(top_srcdir)/lib \
+	-I$(top_srcdir)/src \
 	@MONGOC_CFLAGS@ \
 	$(NULL)
 

src/sgw/sgw_context.c

@@ -7,15 +7,15 @@
 
 #include <mongoc.h>
 #include <yaml.h>
-#include "yaml_helper.h"
+#include "app/yaml_helper.h"
 
-#include "gtp_types.h"
-#include "gtp_conv.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
-#include "gtp_xact.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
+#include "gtp/gtp_xact.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "sgw_context.h"
 
 static sgw_context_t self;

src/sgw/sgw_context.h

@@ -9,8 +9,8 @@
 #include "core_network.h"
 
 #include "3gpp_types.h"
-#include "gtp_types.h"
-#include "gtp_message.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_message.h"
 
 #ifdef __cplusplus
 extern "C" {

src/sgw/sgw_gtp_path.c

@@ -3,9 +3,9 @@
 #include "core_pkbuf.h"
 
 #include "3gpp_types.h"
-#include "gtp_types.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
 
 #include "sgw_context.h"
 #include "sgw_event.h"

src/sgw/sgw_gtp_path.h

@@ -1,7 +1,7 @@
 #ifndef __SGW_PATH_H__
 #define __SGW_PATH_H__
 
-#include "gtp_xact.h"
+#include "gtp/gtp_xact.h"
 
 #ifdef __cplusplus
 extern "C" {

src/sgw/sgw_init.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 #include "core_thread.h"
 
-#include "gtp_xact.h"
+#include "gtp/gtp_xact.h"
 
 #include "sgw_context.h"
 #include "sgw_sm.h"

src/sgw/sgw_s11_handler.c

@@ -3,12 +3,12 @@
 #include "core_debug.h"
 #include "core_lib.h"
 
-#include "gtp_types.h"
-#include "gtp_conv.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "sgw_event.h"
 #include "sgw_context.h"
 #include "sgw_gtp_path.h"

src/sgw/sgw_s11_handler.h

@@ -1,7 +1,7 @@
 #ifndef __SGW_S11_HANDLER_H__
 #define __SGW_S11_HANDLER_H__
 
-#include "gtp_message.h"
+#include "gtp/gtp_message.h"
 
 #include "sgw_context.h"
 

src/sgw/sgw_s5c_handler.c

@@ -3,12 +3,12 @@
 #include "core_debug.h"
 #include "core_lib.h"
 
-#include "gtp_conv.h"
-#include "gtp_types.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
 
-#include "context.h"
+#include "app/context.h"
 #include "sgw_event.h"
 #include "sgw_context.h"
 #include "sgw_gtp_path.h"

src/sgw/sgw_s5c_handler.h

@@ -1,7 +1,7 @@
 #ifndef __SGW_S5C_HANDLER_H__
 #define __SGW_S5C_HANDLER_H__
 
-#include "gtp_message.h"
+#include "gtp/gtp_message.h"
 
 #include "sgw_context.h"
 

src/sgw/sgw_sm.c

@@ -1,7 +1,7 @@
 #define TRACE_MODULE _sgw_sm
 #include "core_debug.h"
 
-#include "gtp_node.h"
+#include "gtp/gtp_node.h"
 
 #include "sgw_context.h"
 #include "sgw_event.h"

test/Makefile.am

@@ -15,18 +15,10 @@ testepc_LDADD = \
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/3gpp \
+    -I$(top_srcdir)/lib \
+    -I$(top_srcdir)/src \
     -I$(top_srcdir)/lib/s1ap/asn1c \
-    -I$(top_srcdir)/lib/s1ap \
-    -I$(top_srcdir)/lib/nas \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-    -I$(top_srcdir)/lib/fd/s6a \
-    -I$(top_srcdir)/lib/fd \
-    -I$(top_srcdir)/lib/gtp \
-    -I$(top_srcdir)/src/mme \
-    -I$(top_srcdir)/src/hss \
-    -I$(top_srcdir)/src/sgw \
-	-I$(top_srcdir)/src/app \
 	@MONGOC_CFLAGS@ \
 	$(NULL)
 

test/attach_test.c

@@ -4,9 +4,9 @@
 #include "core_lib.h"
 #include <mongoc.h>
 
-#include "context.h"
-#include "mme_context.h"
-#include "s1ap_message.h"
+#include "app/context.h"
+#include "mme/mme_context.h"
+#include "s1ap/s1ap_message.h"
 
 #include "testutil.h"
 #include "testpacket.h"

test/gtp_message_test.c

@@ -4,8 +4,8 @@
 #include "core_network.h"
 
 #include "3gpp_types.h"
-#include "gtp_types.h"
-#include "gtp_message.h"
+#include "gtp/gtp_types.h"
+#include "gtp/gtp_message.h"
 
 #include "testutil.h"
 

test/handover_test.c

@@ -4,9 +4,9 @@
 #include "core_lib.h"
 #include <mongoc.h>
 
-#include "context.h"
-#include "mme_context.h"
-#include "s1ap_message.h"
+#include "app/context.h"
+#include "mme/mme_context.h"
+#include "s1ap/s1ap_message.h"
 
 #include "testutil.h"
 #include "testpacket.h"

test/nas_message_test.c

@@ -3,8 +3,8 @@
 
 #include "3gpp_types.h"
 
-#include "nas_message.h"
-#include "nas_security.h"
+#include "nas/nas_message.h"
+#include "mme/nas_security.h"
 
 #include "testutil.h"
 

test/s1ap_message_test.c

@@ -4,8 +4,8 @@
 
 #include "3gpp_types.h"
 
-#include "s1ap_build.h"
-#include "s1ap_conv.h"
+#include "mme/s1ap_build.h"
+#include "mme/s1ap_conv.h"
 
 #include "testutil.h"
 #include "testpacket.h"

test/s1setup_test.c

@@ -3,8 +3,8 @@
 
 #include "3gpp_types.h"
 
-#include "s1ap_build.h"
-#include "s1ap_conv.h"
+#include "mme/s1ap_build.h"
+#include "mme/s1ap_conv.h"
 
 #include "testutil.h"
 #include "testpacket.h"

test/security_test.c

@@ -3,11 +3,11 @@
 #include "core_sha2_hmac.h"
 #include "core_pkbuf.h"
 
-#include "nas_message.h"
+#include "nas/nas_message.h"
 
-#include "milenage.h"
-#include "hss_kdf.h"
-#include "nas_security.h"
+#include "hss/milenage.h"
+#include "hss/hss_kdf.h"
+#include "mme/nas_security.h"
 
 #include "testutil.h"
 

test/testpacket.c

@@ -3,17 +3,17 @@
 #include "core_debug.h"
 #include "core_lib.h"
 
-#include "s1ap_build.h"
-#include "s1ap_conv.h"
-#include "s1ap_path.h"
+#include "mme/s1ap_build.h"
+#include "mme/s1ap_conv.h"
+#include "mme/s1ap_path.h"
 
-#include "gtp_message.h"
-#include "gtp_conv.h"
-#include "gtp_node.h"
-#include "gtp_path.h"
+#include "gtp/gtp_message.h"
+#include "gtp/gtp_conv.h"
+#include "gtp/gtp_node.h"
+#include "gtp/gtp_path.h"
 
-#include "context.h"
-#include "mme_context.h"
+#include "app/context.h"
+#include "mme/mme_context.h"
 
 extern int test_only_control_plane;
 

test/testpacket.h

@@ -4,7 +4,7 @@
 #include "core_network.h"
 #include "core_pkbuf.h"
 
-#include "s1ap_message.h"
+#include "s1ap/s1ap_message.h"
 
 #ifdef __cplusplus
 extern "C" {

test/testutil.c

@@ -17,10 +17,10 @@
 #include "core_general.h"
 #include "core_debug.h"
 #include "core_semaphore.h"
-#include "fd_lib.h"
+#include "fd/fd_lib.h"
 
-#include "app.h"
-#include "context.h"
+#include "app/app.h"
+#include "app/context.h"
 #include "testpacket.h"
 #include "abts.h"
 #include "testutil.h"

test/volte_test.c

@@ -4,9 +4,9 @@
 #include "core_lib.h"
 #include <mongoc.h>
 
-#include "context.h"
-#include "mme_context.h"
-#include "s1ap_message.h"
+#include "app/context.h"
+#include "mme/mme_context.h"
+#include "s1ap/s1ap_message.h"
 
 #include "testutil.h"
 #include "testpacket.h"