--- a/components/sim_b_lib	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/sim_b_lib	Sun Jul 15 22:53:50 2018 +0000
@@ -4,7 +4,7 @@
 CPPFLAGS=
 
 make_version sim
-cfile_plain sim_version.c
+c_file sim_version.c
 
 # Defines
 
@@ -70,24 +70,24 @@
 
 SRCDIR=$SRC/g23m-gsm/sim
 
-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$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$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
 # Source modules
 
-cfile_str2ind $SRCDIR/sim_app.c
-cfile_str2ind $SRCDIR/sim_fkt.c
-cfile_str2ind $SRCDIR/sim_pei.c
-cfile_str2ind $SRCDIR/sim_stk.c
+c_file $SRCDIR/sim_app.c
+c_file $SRCDIR/sim_fkt.c
+c_file $SRCDIR/sim_pei.c
+c_file $SRCDIR/sim_stk.c
 
 if [ "$GPRS" = 1 ]
 then
-	cfile_str2ind $SRCDIR/sim_gprs.c
+	c_file $SRCDIR/sim_gprs.c
 fi
 
-cfile_str2ind $SRCDIR/sim_em.c
+c_file $SRCDIR/sim_em.c