--- a/gsm-fw/bsp/abb+spi/abb_core_inth.c	Sun Aug 17 00:56:26 2014 +0000
+++ b/gsm-fw/bsp/abb+spi/abb_core_inth.c	Sun Aug 17 03:28:56 2014 +0000
@@ -34,16 +34,16 @@
 /******************************************************************************/
 
 #include "../../include/config.h"
+#include "../../include/sys_types.h"
+#include "../../riviera/rv/general.h"
+#include "../../nucleus/nucleus.h"      // for NUCLEUS functions and types
+
 #include "../../L1/include/l1_confg.h"
 #include "../../L1/include/l1_macro.h"
 
 #include <string.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 "../../riviera/rv/rv_defined_swe.h"     // for RVM_PWR_SWE
 #endif
@@ -54,7 +54,7 @@
 
 #include "../iq.h"
 
-#include "../../osx/cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 #include "../../L1/include/l1_signa.h"
 #include "abb.h"
 
@@ -62,7 +62,9 @@
   #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
+#if 0	// FreeCalypso
   #include "power/power.h"	 
+#endif
 #endif	/* (OP_L1_STANDALONE == 0) */