--- a/nuc-fw/riviera/rvt/rvt_task.c	Thu Oct 31 00:55:14 2013 +0000
+++ b/nuc-fw/riviera/rvt/rvt_task.c	Thu Oct 31 04:37:17 2013 +0000
@@ -19,23 +19,20 @@
 *
 ***************************************************************************/
 
-
-#include "nucleus.h"
+#include "../../include/config.h" 
 
-#include "rv/general.h"
-#include "rv/rv_general.h"
-#include "rvf/rvf_api.h"
-#include "rvt/rvt_gen.h"
-#include "rvt/rvt_def_i.h"
-#include "rvt/rvt_env.h"
-#include "rvt/rvt_env_i.h"
-#include "rvm/rvm_use_id_list.h"
+#include "../rv/general.h"
+#include "../rv/rv_general.h"
+#include "../rvf/rvf_api.h"
+#include "rvt_gen.h"
+#include "rvt_def_i.h"
+#include "rvt_env.h"
+#include "rvt_env_i.h"
+#include "../rvm/rvm_use_id_list.h"
 
-#include "uart/serialswitch.h"
+#include "../../serial/serialswitch.h"
 
-#ifndef _WINDOWS
-	#include "config/swconfig.cfg"
-#endif
+#include "../../nucleus/nucleus.h"
 
 #include <string.h>
 
@@ -245,7 +242,7 @@
 			} // End of if (event & (RVF_TIMER_0_EVT_MASK))
 		}
 	#else
-	
+
 		// Start the 'Alive Polling Timer'
 		#if (OP_WCP == 0)
 		  rvf_start_timer (RVF_TIMER_0,