--- a/gsm-fw/g23m-aci/aci/ati_cc.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_cc.c	Thu Mar 12 05:29:06 2015 +0000
@@ -20,6 +20,11 @@
 #ifndef ATI_CC_C
 #define ATI_CC_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"
@@ -138,7 +143,7 @@
     cmd.ctrl_params     = BAT_CMD_AT_D;
     cmd.params.ptr_at_d = &bat_dial;
     
-#pragma message(__TODO__"atD(): check for UCS2 dial string before bat_send()")    
+#warning "atD(): check for UCS2 dial string before bat_send()"
 
     bat_dial.c_dial_string = strlen(cl);
     if (bat_dial.c_dial_string)
@@ -204,9 +209,9 @@
                          lenAlpha,
                          (UBYTE*)cvtdAlpha,
                          &lenCvtdAlpha,
-#ifdef REL99
+    #ifdef REL99
                          sizeof(cvtdAlpha),
-#endif
+    #endif
                          GSM_ALPHA_Int);
   #endif /* #ifdef NO_ASCIIZ */
         t_p = cvtdAlpha;
@@ -2107,7 +2112,7 @@
       }
       ACI_MALLOC (calLst, MAX_CALL_NR * sizeof (T_ACI_CLCC_CALDESC));
       (void)qAT_PlusCLCC((T_ACI_CMD_SRC)srcId, calLst); /* Always returns AT_CMPL */
-	  
+
       /* 20 is approximatly the amount of extra characters (like ",") */
 
       for( lstIdx = 0; lstIdx < MAX_CALL_NR; lstIdx++ )
@@ -2619,13 +2624,13 @@
     for(i=0; i<blackl.blCount; i++) /* output black list */
     {
         type = (UBYTE)toa_merge(blackl.blNum[i].type);
-		for(j=0; j<blackl.blNum[i].numb_len; j++)
+	for(j=0; j<blackl.blNum[i].numb_len; j++)
         {
           blackl.blNum[i].number[j] = (blackl.blNum[i].number[j] | 0x30);
         }
         sprintf(g_sa,"%s:\"%s\",%d","%RDLB",blackl.blNum[i].number,
                                          (int)type);
-		io_sendMessage(srcId, g_sa, ATI_NORMAL_OUTPUT);
+	io_sendMessage(srcId, g_sa, ATI_NORMAL_OUTPUT);
     }
   }
   else