--- a/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 22:29:40 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 22:38:19 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_pei.o
+	rr_dats.o rr_em.o rr_forf.o rr_forp.o rr_fors.o rr_pei.o rr_srv.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/rr/rr_srv.c	Sun Oct 05 22:29:40 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_srv.c	Sun Oct 05 22:38:19 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef RR_SRV_C
 #define RR_SRV_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 
 /*==== INCLUDES ===================================================*/
@@ -88,7 +92,6 @@
     return FALSE;
   }
 
-
   /*
    * Else store the primitive
    */
@@ -331,8 +334,8 @@
 +---------------------------------------------------------------------------+
 
   PURPOSE : Looks at the frequency bands which were used    and compares 
-			them with the supported bands. Checks if the MA spans more 
-			then one band  (exception is the EGSM part).    
+	    them with the supported bands. Checks if the MA spans more 
+	    then one band  (exception is the EGSM part).    
 
 */
 
@@ -399,7 +402,7 @@
             is member of the frequency hopping list.
 
             e.g:    channel list has the members 10,20,30,40,50,60,70 and
-                    in the mobile allocation the bits 1,3 and 4 are set           :
+                    in the mobile allocation the bits 1,3 and 4 are set:
 
             channel list:        10  20  30  40  50  60  70
             mobile allocation:    0   1   0   1   1   0   0
@@ -496,7 +499,6 @@
   }
 
   return srv_compare_used_frequency_bands(freq_band_used);
-  
 }
 
 
@@ -507,7 +509,7 @@
 +----------------------------------------------------------------------+
 
   PURPOSE : Checks used frequencies and returns. Returns number 
-			of frequencies used. 
+	    of frequencies used. 
 
 */
 
@@ -518,7 +520,6 @@
 
   TRACE_FUNCTION ("srv_check_frequencies_in_list()");
 
-
   /*
    * Depending on the frequency standard
    */