--- a/gsm-fw/bsp/abb+spi/abb.c	Sat Nov 16 20:55:06 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb.c	Sun Nov 17 04:50:45 2013 +0000
@@ -27,26 +27,24 @@
 /**********************************************************************************/
 
 #include "../../include/config.h"
+#include "../../L1/include/l1_confg.h"
+#include "../../L1/include/l1_macro.h"
 
 #include "abb.h"
-#include "l1_macro.h"
-#include "l1_confg.h"
-#include "clkm/clkm.h"         // for wait_ARM_cycles function
+#include "../clkm.h"         // for wait_ARM_cycles function
 #include "abb_inline.h"
-#include "ulpd/ulpd.h"        // for FRAME_STOP definition
-#include "nucleus.h"      // for NUCLEUS functions and types
-#include "l1_types.h"
+#include "../ulpd.h"        // for FRAME_STOP definition
+#include "../../nucleus/nucleus.h"      // for NUCLEUS functions and types
+#include "../../L1/include/l1_types.h"
 
-#if (OP_L1_STANDALONE == 0)
-  #include "main/sys_types.h"
-  #include "rv/general.h"
-  #include "buzzer/buzzer.h"	     // for BZ_KeyBeep_OFF function
-#else
-  #include "sys_types.h"
+#include "../../include/sys_types.h"
+#include "../../riviera/rv/general.h"
+#if 0
+#include "buzzer/buzzer.h"	     // for BZ_KeyBeep_OFF function
 #endif
 
 #if (VCXO_ALGO == 1)
-  #include "l1_ctl.h"
+  #include "../../L1/include/l1_ctl.h"
 #endif
 
 #if (RF_FAM == 35)