--- a/gsm-fw/g23m-aci/aci/ati_bas.c	Sun Mar 08 23:42:01 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_bas.c	Wed Mar 11 08:27:02 2015 +0000
@@ -21,6 +21,11 @@
 #ifndef ATI_BAS_C
 #define ATI_BAS_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #include <ctype.h>
@@ -60,7 +65,7 @@
 #include "ati_int.h"
 
 #ifndef _SIMULATION_
-#include "ffs\ffs.h"
+#include "../../services/ffs/ffs.h"
 #endif
 
 #ifdef FF_ATI_BAT
@@ -562,10 +567,10 @@
               return ATI_FAIL;
             }
             break;
+
 #if defined (GPRS) AND defined (DTI)
           case(99):
-
-			  if (reg_cont<0 OR reg_cont > 255)
+	    if (reg_cont<0 OR reg_cont > 255)
             {
               cmdAtError(atError);
               return ATI_FAIL;
@@ -1797,7 +1802,7 @@
     }
     sprintf(g_sa, "+CBC: %d,%d", bcs, powerStat.ChargeLevel );
     io_sendMessage(srcId, g_sa, ATI_NORMAL_OUTPUT);
-	return ATI_CMPL;
+    return ATI_CMPL;
   }
 }
 
@@ -2369,13 +2374,13 @@
   if ( !cl OR val > CMEE_MOD_Verbose OR val < CMEE_MOD_Disable )
   {
     cmdAtError(atError);
-	return ATI_FAIL;
+    return ATI_FAIL;
   }
   else
   {
     TRACE_EVENT_P2("setatPlusCMEE: srcId = %d Value = %d", srcId, val);
     ati_user_output_cfg[srcId].CMEE_stat = (UBYTE)val;
-	return ATI_CMPL;
+    return ATI_CMPL;
   }
 }