--- a/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 19:03:38 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/Makefile	Sun Oct 05 19:24:06 2014 +0000
@@ -5,7 +5,7 @@
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
 	-I../../cdginc
 
-OBJS=	rr_attf.o rr_attp.o rr_atts.o rr_cs.o rr_csf.o rr_datf.o
+OBJS=	rr_attf.o rr_attp.o rr_atts.o rr_cs.o rr_csf.o rr_datf.o rr_datp.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/rr/rr_datp.c	Sun Oct 05 19:03:38 2014 +0000
+++ b/gsm-fw/g23m-gsm/rr/rr_datp.c	Sun Oct 05 19:24:06 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef RR_DATP_C
 #define RR_DATP_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_RR
 
 /*==== INCLUDES ===================================================*/
@@ -112,8 +116,8 @@
     case DAT_CHAN_ASS_1:
     case DAT_CHAN_ASS_2:
     case DAT_IMM_ASS_1:
-    	    
       break;
+
     default :
       if (dl_establish_cnf->sapi EQ SAPI_0)
       {
@@ -345,7 +349,6 @@
       }
 #endif
 
-
       /*
        * initialize some variables for the dedicated mode.
        */
@@ -377,12 +380,10 @@
         /*
          * building of the Early Classmark Sending message
          */
-      
-/* Implements RR Clone findings #15 */
-          dat_class_chng_data_req();
+        /* Implements RR Clone findings #15 */
+        dat_class_chng_data_req();
       }
 
-   
 #ifdef GPRS
       dat_gprs_suspend_req ();
 #endif
@@ -543,8 +544,6 @@
           rr_data->ms_data.all_conf_received = TRUE;
         }
       }
-
-
       break;
 
     default:
@@ -777,11 +776,10 @@
 
       EM_HO_FAILURE_RECONNECT_FAILED2;
 
-
       break;
 
     case DAT_IMM_ASS_1:
-      
+
       /*
        * layer 2 establishment has failed during immediate assignment
        */