--- a/gsm-fw/gpf/tst_drv/titrc.c	Sun Apr 13 08:19:38 2014 +0000
+++ b/gsm-fw/gpf/tst_drv/titrc.c	Sat Apr 19 00:18:44 2014 +0000
@@ -23,12 +23,13 @@
 #define __TITRC_C__
 #endif
 
+#include <string.h>
+#include "gpfconf.h"
 #include "typedefs.h"
-#include "string.h"
 #include "tstheader.h"
-#include "rvt_gen.h"
+#include "../../riviera/rvt/rvt_gen.h"
 #include "gdi.h"
-#include "serialswitch.h"
+#include "../../serial/serialswitch.h"
 
 /*==== TYPES ======================================================*/
 
@@ -185,7 +186,7 @@
 */
 USHORT TITRC_SetSignal ( USHORT SignalType )
 {
-	if ( !(SignalType & ALLOWED_TITRC_SIGNALS) )
+  if ( !(SignalType & ALLOWED_TITRC_SIGNALS) )
     return DRV_INVALID_PARAMS;
   else
     TITRC_Data.EnabledSignalType |= SignalType;
@@ -206,7 +207,7 @@
 */
 USHORT TITRC_ResetSignal ( USHORT SignalType )
 {
-	if ( !(SignalType & ALLOWED_TITRC_SIGNALS) )
+  if ( !(SignalType & ALLOWED_TITRC_SIGNALS) )
     return DRV_INVALID_PARAMS;
   else
     TITRC_Data.EnabledSignalType &= ~SignalType;
@@ -231,7 +232,7 @@
   if ( TITRC_Data.connected == FALSE )
   {
     Signal.SignalType = DRV_SIGTYPE_CONNECT;
-	  Signal.DrvHandle = TITRC_Data.Handle;
+    Signal.DrvHandle = TITRC_Data.Handle;
     (TITRC_Data.Callback)( &Signal );
     TITRC_Data.connected = TRUE;
   }
@@ -256,16 +257,16 @@
     for (;;)
       ;
 
-	callback_busy = 1;
+  callback_busy = 1;
   if ( TITRC_Data.EnabledSignalType & DRV_SIGTYPE_READ )
   {
     TITRC_Data.read_ptr = ptr;
     TITRC_Data.read_len = len;
     Signal.SignalType = DRV_SIGTYPE_READ;
-	  Signal.DrvHandle = TITRC_Data.Handle;
+    Signal.DrvHandle = TITRC_Data.Handle;
     (TITRC_Data.Callback)( &Signal );
   }
-	callback_busy = 0;
+  callback_busy = 0;
 }
 #endif