--- a/gsm-fw/bsp/abb+spi/abb_core_inth.c	Sun Nov 17 06:08:47 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb_core_inth.c	Sun Nov 17 08:15:19 2013 +0000
@@ -33,39 +33,35 @@
 /*                                                                                */
 /**********************************************************************************/
 
-#include "l1sw.cfg"
-#include "chipset.cfg"
-#include "swconfig.cfg"
-#include "sys.cfg"
+#include "../../include/config.h"
+#include "../../L1/include/l1_confg.h"
+#include "../../L1/include/l1_macro.h"
 
-#include "l1_macro.h"
-#include "l1_confg.h"
 #include <string.h>          
-#include "abb/abb_core_inth.h"
-#include "nucleus.h"
+#include "abb_core_inth.h"
+
+#include "../../include/sys_types.h"
+#include "../../riviera/rv/general.h"
+#include "../../nucleus/nucleus.h"      // for NUCLEUS functions and types
 
 #if (OP_L1_STANDALONE == 0)
-  #include "rv/rv_defined_swe.h"     // for RVM_PWR_SWE
+  #include "../../riviera/rv/rv_defined_swe.h"     // for RVM_PWR_SWE
 #endif
 
 #if (OP_L1_STANDALONE == 1)
-  #include "l1_types.h"
-#endif
-
-#if (CHIPSET == 12)
-    #include "sys_inth.h"
-#else
-    #include "inth/iq.h"
+  #include "../../L1/include/l1_types.h"
 #endif
 
-#include "cust_os.h"
-#include "l1_signa.h"
-#include "abb/abb.h"
+#include "../iq.h"
+
+#include "../../osx/cust_os.h"
+#include "../../L1/include/l1_signa.h"
+#include "abb.h"
 
 #if(OP_L1_STANDALONE == 0)
-  #include "rvm/rvm_use_id_list.h"   // for SPI_USE_ID
-  #include "spi/spi_env.h"
-  #include "spi/spi_process.h"       // for ABB_EXT_IRQ_EVT
+  #include "../../riviera/rvm/rvm_use_id_list.h"   // for SPI_USE_ID
+  #include "spi_env.h"
+  #include "spi_process.h"       // for ABB_EXT_IRQ_EVT
   #include "power/power.h"	 
 #endif	/* (OP_L1_STANDALONE == 0) */