--- a/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 22:15:48 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 22:29:40 2014 +0000
@@ -6,7 +6,7 @@
 	-I../../cdginc
 
 OBJS=	rr_attf.o rr_attp.o rr_atts.o rr_cs.o rr_csf.o rr_datf.o rr_datp.o \
-	rr_dats.o rr_em.o rr_forf.o rr_forp.o rr_fors.o
+	rr_dats.o rr_em.o rr_forf.o rr_forp.o rr_fors.o rr_pei.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/rr/rr_pei.c	Sun Oct 05 22:15:48 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_pei.c	Sun Oct 05 22:29:40 2014 +0000
@@ -1,4 +1,4 @@
- /*
+/*
 +-----------------------------------------------------------------------------
 |  Project :
 |  Modul   :
@@ -22,6 +22,10 @@
 #ifndef RR_PEI_C
 #define RR_PEI_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 
 /*==== INCLUDES ===================================================*/
@@ -47,7 +51,7 @@
 #include "cl_shrd.h"
 
 #if !defined(_SIMULATION_)
-#include "ffs/ffs.h"
+#include "../../services/ffs/ffs.h"
 #include "ffs_coat.h"
 #endif  /* !_SIMULATION_ */
 
@@ -79,8 +83,6 @@
 
 #endif /* TI_PS_HCOMM_CHANGE */
 
-
-
 static UBYTE stop_reg = FALSE;
 
 GLOBAL  T_RR_DATA  rr_data_base;
@@ -496,7 +498,6 @@
   }
 #endif
 
-
   if (hCommMMI < VSI_OK)
   {
     /*
@@ -507,6 +508,7 @@
       return PEI_ERROR;
   }
 #endif /* TI_PS_HCOMM_CHANGE */
+
   rr_data->ms_data.multislot_class_configured = FALSE;
   rr_data->ms_data.cmsp_configured = FALSE;
   /*
@@ -786,7 +788,6 @@
           rr_data->dyn_config.scr = 1;
           break;
 
-
         case DLE:         /* downlink error        */
           {
             PALLOC (error_ind, MPH_ERROR_IND);
@@ -1061,8 +1062,6 @@
           TRACE_ERROR ("[PEI_CONFIG]: TNORMAL_CS-Wrong Number of Parameters");
         }
         break;
-
-
 #endif
 
 #if defined (_SIMULATION_)
@@ -1215,7 +1214,7 @@
       case SHIELD:
         if(!valno)
         {
-          memset(&rr_data->dyn_config.mcc_shield,0,sizeof(T_shield_mcc));                  
+          memset(&rr_data->dyn_config.mcc_shield,0,sizeof(T_shield_mcc));
         }
         else
         {
@@ -1250,7 +1249,6 @@
             } 
           }
           rr_data->dyn_config.mcc_shield.index = index;
-          
        } 
        rr_csf_write_mcc_shield_to_ffs();        
        break;	
@@ -1412,13 +1410,13 @@
           SHORT plmn  = atoi (val[0]);
           /* copy MCC */
           rr_data->cs_data.white_list.last_sc_lac.mcc[0] = (plmn/100);
-          rr_data->cs_data.white_list.last_sc_lac.mcc[1] = (plmn/10)%10;            
+          rr_data->cs_data.white_list.last_sc_lac.mcc[1] = (plmn/10)%10;
           rr_data->cs_data.white_list.last_sc_lac.mcc[2] = (plmn % 10);
-          
+
           /* Copy MNC */
           plmn  = atoi (val[1]);
           rr_data->cs_data.white_list.last_sc_lac.mnc[0] = (plmn/100);
-          rr_data->cs_data.white_list.last_sc_lac.mnc[1] = (plmn/10)%10;            
+          rr_data->cs_data.white_list.last_sc_lac.mnc[1] = (plmn/10)%10;
           rr_data->cs_data.white_list.last_sc_lac.mnc[2] = (plmn % 10);
 
           if(!rr_data->cs_data.white_list.last_sc_lac.mnc[2])
@@ -1431,7 +1429,6 @@
             rr_data->cs_data.white_list.last_sc_lac.mnc[0],
             rr_data->cs_data.white_list.last_sc_lac.mnc[1],
             rr_data->cs_data.white_list.last_sc_lac.mnc[2]); 
-
         }
         break;
       case SET_NPS_DELAY: