--- a/nuc-fw/riviera/rvt/rvt_api.c	Thu Oct 31 00:55:14 2013 +0000
+++ b/nuc-fw/riviera/rvt/rvt_api.c	Thu Oct 31 04:37:17 2013 +0000
@@ -17,15 +17,15 @@
 
 
 
-#include "rv/general.h"
-#include "rv/rv_general.h"
-#include "rvf/rvf_api.h"
-#include "rvm/rvm_use_id_list.h"
+#include "../rv/general.h"
+#include "../rv/rv_general.h"
+#include "../rvf/rvf_api.h"
+#include "../rvm/rvm_use_id_list.h"
 
-#include "rvt/rvt_gen.h"
-#include "rvt/rvt_def_i.h"
-#include "rvt/rvt_env.h"
-#include "rvt/rvt_env_i.h"
+#include "rvt_gen.h"
+#include "rvt_def_i.h"
+#include "rvt_env.h"
+#include "rvt_env_i.h"
 
 #include <string.h>
 
@@ -96,9 +96,9 @@
 
 T_RVT_RET
 rvt_send_trace_no_cpy(	T_RVT_BUFFER msg, 
-						T_RVT_USER_ID user_id, 
-						T_RVT_MSG_LG msg_length, 
-						T_RVT_FORMAT msg_format)
+			T_RVT_USER_ID user_id, 
+			T_RVT_MSG_LG msg_length, 
+			T_RVT_FORMAT msg_format)
 {
 	/* Shift the pointer back to write control values */
 	T_RVT_TRACE_RQST * req_msg = (T_RVT_TRACE_RQST * )((UINT8*)msg - RVT_HEADER_SIZE);
@@ -115,10 +115,10 @@
 	/* Add the id, size and format of the msg at the beginning */	
 	
 	req_msg->header.msg_id	= RVT_TRACE_RQST_ID;
-	req_msg->format			= msg_format;
-	req_msg->user_id		= user_id;
-	req_msg->msg_length		= msg_length;
-    
+	req_msg->format		= msg_format;
+	req_msg->user_id	= user_id;
+	req_msg->msg_length	= msg_length;
+
 	if (rvf_send_msg(rvt_addr_id, (void *) req_msg) != RVF_OK)
 	{
 		(rvt_lost_msg_cpt.bit_mask).count++;
@@ -140,12 +140,9 @@
 /*                                                                              */
 /********************************************************************************/
 T_RVT_RET rvt_send_trace_cpy (T_RVT_BUFFER msg, 
-						T_RVT_USER_ID user_id, 
-						T_RVT_MSG_LG msg_length, 
-						T_RVT_FORMAT msg_format)
-
-		
-
+				T_RVT_USER_ID user_id, 
+				T_RVT_MSG_LG msg_length, 
+				T_RVT_FORMAT msg_format)
 {
 	T_RVT_TRACE_RQST * req ;
 
@@ -167,7 +164,7 @@
 
  	/* Add the id, size and format of the msg at the beginning */	
 	req->header.msg_id	= RVT_TRACE_RQST_ID;
-	req->format			= msg_format;
+	req->format		= msg_format;
 	req->user_id		= user_id;
 	req->msg_length		= msg_length;