--- a/components/ffs_drv	Sun Jul 15 22:20:36 2018 +0000
+++ b/components/ffs_drv	Sun Jul 15 22:53:50 2018 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -52,11 +52,11 @@
 
 SRCDIR=$SRC/cs/drivers/drv_app/ffs/board
 
-cfile_plain $SRCDIR/cfgffs.c
-cfile_plain $SRCDIR/dev.c
-cfile_plain $SRCDIR/pcmcode.c
-cfile_plain $SRCDIR/task.c
-cfile_plain $SRCDIR/tmffs.c
+c_file $SRCDIR/cfgffs.c
+c_file $SRCDIR/dev.c
+c_file $SRCDIR/pcmcode.c
+c_file $SRCDIR/task.c
+c_file $SRCDIR/tmffs.c
 
 # Different CFLAGS and CPPFLAGS for ffs_env.c
 
@@ -68,8 +68,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -91,4 +91,4 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/services"
 
-cfile_plain $SRCDIR/ffs_env.c
+c_file $SRCDIR/ffs_env.c