--- a/gsm-fw/bsp/rtc/rtc_functions.c	Sun Nov 17 22:52:52 2013 +0000
+++ b/gsm-fw/bsp/rtc/rtc_functions.c	Mon Nov 18 00:08:43 2013 +0000
@@ -9,30 +9,23 @@
 /*   Date: 03/20/01                                                           */
 /******************************************************************************/
 
-#ifndef _WINDOWS
-   #include "l1sw.cfg" 
-   #include "chipset.cfg" 
-#endif
+#include "../../include/config.h"
 
 #include <string.h> /* needed for memset */
-#include "nucleus.h" 
 
-#include "rtc/rtc_messages_i.h"
-#include "rtc/rtc_api.h"
-#include "rtc/rtc_i.h"
-#include "rtc/board/rtc_config.h" 
-
-#include "rvm/rvm_use_id_list.h"
+#include "rtc_messages_i.h"
+#include "rtc_api.h"
+#include "rtc_i.h"
+#include "rtc_config.h" 
 
-#include "memif/mem.h"
-#include "inth/iq.h"
-#include "ulpd/ulpd.h"
+#include "../../riviera/rvm/rvm_use_id_list.h"
 
-#if (CHIPSET == 12)
-  #include "inth/sys_inth.h"
-#else
-  #include "inth/inth.h"
-#endif
+#include "../mem.h"
+#include "../iq.h"
+#include "../ulpd.h"
+#include "../inth.h"
+
+#include "../../nucleus/nucleus.h" 
 
 /* ----- Macro ----- */
 /*-------------------------------------------------------------*/
@@ -337,7 +330,7 @@
     *(volatile UINT8*) RTC_CTRL_REG &= ~RTC_AUTO_COMP;
 
     /* For CHIPSET = 7, 9, 10 or 11, set analog baseband type */
-#if (((CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 10) || (CHIPSET == 11)) && (ANLG_FAM == 1))
+#if (((CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 10) || (CHIPSET == 11)) && (ANALOG == 1))
    *(volatile UINT8*) RTC_CTRL_REG |= RTC_nDELTA_OMEGA;
 #endif
 
@@ -805,8 +798,3 @@
       }
    }
 }
-
-
-
-/*---------------------------------------------------------------------------------------*/
-