--- a/gsm-fw/g23m-aci/aci/aci_pei.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_pei.c	Sun Mar 08 23:42:01 2015 +0000
@@ -22,12 +22,17 @@
 #ifndef ACI_PEI_C
 #define ACI_PEI_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #include "ccdapi.h"
 #include "cnf_aci.h"
 #include "mon_aci.h"  /* mouais... */
-#include "P_ACI.val"    /* SKA 2002-09-02 for MAX_CMD_LEN */
+#include "p_aci.val"    /* SKA 2002-09-02 for MAX_CMD_LEN */
 #include "line_edit.h"  /* SKA 2002-09-02                 */
 #include "aci_cmh.h"
 #include "ati_cmd.h"
@@ -35,7 +40,7 @@
 #include "aci.h"
 #include "aci_mem.h"
 
-#ifndef _SIMULATION_
+#if 0 //#ifndef _SIMULATION_	// FreeCalypso change
 #include "rv_swe.h"
 #ifdef RVM_GIL_SWE
 #include "gil/gil_gpf.h" /* MMI_GIL_IND dispatch function */