--- a/components/drivers_flash	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/drivers_flash	Sun Jul 15 22:53:50 2018 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -44,28 +44,28 @@
 
 # 1st set of source modules
 
-cfile_plain $SRCDIR/dsp_dwnld/leadapi.c
-cfile_plain $SRCDIR/inth/niq.c
-cfile_plain $SRCDIR/uart/uart.c
-cfile_plain $SRCDIR/inth/inth.c
-cfile_plain $SRCDIR/timer/timer.c
-cfile_plain $SRCDIR/timer/timer1.c
-cfile_plain $SRCDIR/timer/timer2.c
-cfile_plain $SRCDIR/timer/timer_sec.c
-cfile_plain $SRCDIR/security/certificate.c
-cfile_plain $SRCDIR/clkm/clkm.c
-cfile_plain $SRCDIR/armio/armio.c
+c_file $SRCDIR/dsp_dwnld/leadapi.c
+c_file $SRCDIR/inth/niq.c
+c_file $SRCDIR/uart/uart.c
+c_file $SRCDIR/inth/inth.c
+c_file $SRCDIR/timer/timer.c
+c_file $SRCDIR/timer/timer1.c
+c_file $SRCDIR/timer/timer2.c
+c_file $SRCDIR/timer/timer_sec.c
+c_file $SRCDIR/security/certificate.c
+c_file $SRCDIR/clkm/clkm.c
+c_file $SRCDIR/armio/armio.c
 
 # 2nd set of source modules
 
 CFLAGS="-me -pw2 -mn -mt"
 
-cfile_plain $SRCDIR/spi/spi_drv.c
-cfile_plain $SRCDIR/abb/abb.c
-cfile_plain $SRCDIR/abb/abb_core_inth.c
+c_file $SRCDIR/spi/spi_drv.c
+c_file $SRCDIR/abb/abb.c
+c_file $SRCDIR/abb/abb_core_inth.c
 
 # niq32
 
 CFLAGS="-me -pw2 -x -o -mw"
 
-cfile_plain $SRCDIR/inth/niq32.c
+c_file $SRCDIR/inth/niq32.c