--- a/components/sm	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/sm	Sun Jul 15 22:53:50 2018 +0000
@@ -54,31 +54,31 @@
 
 SRCDIR=$SRC/g23m-gprs/sm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/sm.c
-cfile_str2ind $SRCDIR/sm_aci_output_handler.c
-cfile_str2ind $SRCDIR/sm_context_control.c
-cfile_str2ind $SRCDIR/sm_context_deactivate_control.c
-cfile_str2ind $SRCDIR/sm_debug.c
-cfile_str2ind $SRCDIR/sm_dispatch_message.c
-cfile_str2ind $SRCDIR/sm_dispatcher.c
-cfile_str2ind $SRCDIR/sm_memory_handler.c
-cfile_str2ind $SRCDIR/sm_mm_output_handler.c
-cfile_str2ind $SRCDIR/sm_network_control.c
-cfile_str2ind $SRCDIR/sm_pei.c
-cfile_str2ind $SRCDIR/sm_qos.c
-cfile_str2ind $SRCDIR/sm_sequencer.c
-cfile_str2ind $SRCDIR/sm_tft.c
-cfile_str2ind $SRCDIR/sm_timer_handler.c
-cfile_str2ind $SRCDIR/sm_upm_output_handler.c
-cfile_str2ind $SRCDIR/sm_user_plane_control.c
+c_file $SRCDIR/sm.c
+c_file $SRCDIR/sm_aci_output_handler.c
+c_file $SRCDIR/sm_context_control.c
+c_file $SRCDIR/sm_context_deactivate_control.c
+c_file $SRCDIR/sm_debug.c
+c_file $SRCDIR/sm_dispatch_message.c
+c_file $SRCDIR/sm_dispatcher.c
+c_file $SRCDIR/sm_memory_handler.c
+c_file $SRCDIR/sm_mm_output_handler.c
+c_file $SRCDIR/sm_network_control.c
+c_file $SRCDIR/sm_pei.c
+c_file $SRCDIR/sm_qos.c
+c_file $SRCDIR/sm_sequencer.c
+c_file $SRCDIR/sm_tft.c
+c_file $SRCDIR/sm_timer_handler.c
+c_file $SRCDIR/sm_upm_output_handler.c
+c_file $SRCDIR/sm_user_plane_control.c