--- a/gsm-fw/g23m-aci/aci/cmh_smsr.c	Sat Apr 04 22:51:00 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_smsr.c	Sun Apr 05 00:38:21 2015 +0000
@@ -24,6 +24,11 @@
 #define CMH_SMSR_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*==== INCLUDES ===================================================*/
 #include "aci_cmh.h"
@@ -52,7 +57,7 @@
 #include "psa_sim.h"
 #include "cmh_sim.h"
 #include "psa_util.h"
-#include "Phb.h"
+#include "phb.h"
 
 #ifdef SIM_TOOLKIT
 #include "psa_sat.h"
@@ -210,7 +215,7 @@
    * new message indication
    *-----------------------------------------------------------------
    */
-  #ifdef FF_MMI_RIV
+#ifdef FF_MMI_RIV
   {
     T_ACI_CMGF_MOD sms_input_mode = CMGF_MOD_NotPresent;
 
@@ -461,7 +466,7 @@
           return AT_FAIL;
       }
     }
-/*-----------------------------------------------------------------------*
+  /*-----------------------------------------------------------------------*
    * The below code is the new code added on 07/08/2003 due to the new     *
    * flag for CMGD command as mentioned in R99. This flag handles the      *
    * deletion of multiple messages. The deletion of concatination is       * 
@@ -2070,11 +2075,11 @@
 //start
 	if (smsShrdPrm.smsEntStat.curCmd!=AT_CMD_CMGL)
 	{
-        smsShrdPrm.smsEntStat.curCmd = AT_CMD_NONE;
-        smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE;
-        smsShrdPrm.smsEntStat.entOwn = CMD_SRC_NONE;
-
-        smsShrdPrm.pDecMsg = NULL;
+          smsShrdPrm.smsEntStat.curCmd = AT_CMD_NONE;
+          smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE;
+          smsShrdPrm.smsEntStat.entOwn = CMD_SRC_NONE;
+
+          smsShrdPrm.pDecMsg = NULL;
 	}
 //end	
         if (mnsms_read_cnf->rec_next EQ SMS_RECORD_NOT_EXIST)