--- a/nuc-fw/riviera/rv/rv_defined_swe.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rv/rv_defined_swe.h	Wed Oct 30 23:19:21 2013 +0000
@@ -29,19 +29,21 @@
 #ifndef _RV_DEFINED_SWE_H_
 #define _RV_DEFINED_SWE_H_
 
-#ifndef _WINDOWS
-   #include "config/l1sw.cfg"
-   #include "config/rv.cfg"
-   #include "config/swconfig.cfg"
-   #include "config/debug.cfg"
-#endif
+#include "../../include/config.h"
+#include "../../L1/include/l1_confg.h"
 
 /*
  * rv_swe.h is generated before build from System/env.mak
  * It is used both for RivieraTool and Target.
+ *
+ * FreeCalypso note: we won't be generating a separate rv_swe.h
+ * file; instead our configuration mechanism will emit the
+ * necessary #define lines into config.h along with all other
+ * definitions.
  */
+#if 0
 #include "rv_swe.h"
-
+#endif
 
 /* ------------------------------------------------------------------
  * Grouped SWEs