--- a/nuc-fw/riviera/rvf/rvf_task.c	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_task.c	Thu Oct 31 00:17:12 2013 +0000
@@ -20,17 +20,16 @@
 /* (C) Copyright 1999 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#ifndef _WINDOWS
-	#include "config/rv.cfg"
-#endif
-
-#include "nucleus.h" 
+#include "../../include/config.h"
 
-#include "rv/rv_general.h"
-#include "rvf/rvf_api.h"
-#include "rvf/rvf_i.h"			
-#include "rvm/rvm_i.h"	 /* ONLY for Task Codes */
-#include "rvm/rvm_use_id_list.h"
+#include "../rv/rv_general.h"
+#include "rvf_api.h"
+#include "rvf_i.h"			
+#include "../rvm/rvm_i.h"	 /* ONLY for Task Codes */
+#include "../rvm/rvm_use_id_list.h"
+
+#include "../../nucleus/nucleus.h"
+
 #include <stdio.h>
 #include <string.h>
 
@@ -874,6 +873,11 @@
 /* Declaration of ASM INT_Check_IRQ_Mask function */
 UINT32 INT_Check_IRQ_Mask(void);
 
+/*
+ * FreeCalypso: this assembly function will be moved out into
+ * its own source file, or maybe added to nucleus/tct.S.
+ */
+#if 0
 asm("           .def	$INT_Check_IRQ_Mask");
 asm("$INT_Check_IRQ_Mask  ");			    
 asm("           .ref _INT_32_Check_IRQ_Mask");
@@ -888,7 +892,7 @@
 
 asm("	MRS	r0,CPSR  ");   // pick up CPSR 
 asm("	BX	lr  ");        // return to caller
-
+#endif
 #endif
 
 
@@ -1171,4 +1175,3 @@
 	if(pRtAddrIdTable[rvf_get_taskid()]->type_code==ET2_HOST_TASK) return 1;
 	else return 0;
 }
-