--- a/gsm-fw/L1/include/l1_defty.h	Fri Aug 01 22:53:45 2014 +0000
+++ b/gsm-fw/L1/include/l1_defty.h	Sat Aug 02 00:40:09 2014 +0000
@@ -7,9 +7,6 @@
  *
  ************* Revision Controle System Header *************/
 
-#include "sys.cfg"
-#include "l1sw.cfg"
-
 #if (L1_RF_KBD_FIX == 1)
 #include "l1_macro.h"
 
@@ -21,10 +18,10 @@
 
 #include "cust_os.h"
 #if(L1_DYN_DSP_DWNLD == 1)
-  #include "l1_dyn_dwl_defty.h"
+  #include "../dyn_dwl_include/l1_dyn_dwl_defty.h"
 #endif
 #if (L1_AAC == 1)  //ADDED for AAC -sajal
-   #include "l1aac_defty.h"
+  #include "l1aac_defty.h"
 #endif
 
 typedef struct
@@ -476,7 +473,7 @@
   API d_task_u;           // 0x0802 (2)  Uplink task command.
   API d_burst_u;          // 0x0803 (3)  Uplink burst identifier.
   API d_task_md;          // 0x0804 (4)  Downlink Monitoring (FB/SB) command.
-#if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+#if (DSP >= 33)
   API d_background;       // 0x0805 (5) Background tasks
 #else
   API d_reserved;         // 0x0805 (5)  Reserved
@@ -556,7 +553,7 @@
   API d_task_u;           // 0x082A (2) Uplink task command.
   API d_burst_u;          // 0x082B (3) Uplink burst identifier.
   API d_task_md;          // 0x082C (4) Downlink Monitoring (FB/SB) task command.
-#if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+#if (DSP >= 33)
   API d_background;       // 0x082D (5) Background tasks
 #else
   API d_reserved;         // 0x082D (5)  Reserved
@@ -564,7 +561,7 @@
   API d_debug;            // 0x082E (6) Debug/Acknowledge/general purpose word.
   API d_task_ra;          // 0x082F (7) RA task command.
 
-#if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+#if (DSP >= 33)
   API a_serv_demod[4];    // 0x0830 ( 8..11) Serv. cell demod. result, array of 4 words (D_TOA,D_PM,D_ANGLE,D_SNR).
   API a_pm[3];            // 0x0834 (12..14) Power measurement results, array of 3 words.
   API a_sch[5];           // 0x0837 (15..19) Header + SB information, array of  5 words.
@@ -1656,7 +1653,7 @@
     API d_thr_sp_dgr;         // thresh detection SPEECH DEGRADED/NO_DATA
     API d_thr_soft_bits;
 
-    #if ((CODE_VERSION == SIMULATION) || (DSP != 37))
+  #if ((CODE_VERSION == SIMULATION) || (DSP != 37))
     #if (MELODY_E2)
       API d_melody_e2_osc_stop;
       API d_melody_e2_osc_active;
@@ -1782,7 +1779,7 @@
       API d_holes[492];
       #if (CODE_VERSION == SIMULATION) || (DSP != 37)
         API a_d_macc_thr_afs[8];  // In ROM37 this is moved from 0x17F1 to 0x151E
-      API a_d_macc_thr_ahs[6];
+        API a_d_macc_thr_ahs[6];
      #else
         API d_holes_rom37[14]; // In ROM37 this is moved from 0x17F1 to 0x151E
      #endif
@@ -2506,7 +2503,7 @@
 T_NDB_MCU_DSP;
 #endif
 
-#if (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+#if (DSP >= 34)
 typedef struct
 {
   API_SIGNED d_transfer_rate;  // 0x0C31
@@ -3302,7 +3299,7 @@
   BOOL         handover_fail_mode;  // Flag used to indicate that the L1 wait for an handover fail request
   #if (AMR == 1)
     BOOL         sync_amr;        // Flag used to tell to the DSP that a new AMR paramters is ready in the NDB.
-#endif  // (AMR == 1)
+  #endif  // (AMR == 1)
 
   #if ((REL99 == 1) && (FF_BHO == 1))
     // For blind handover...
@@ -3628,7 +3625,7 @@
     BOOL enabled;                         // TRUE if enabled, FALSE if disabled
     BOOL automatic_disable;               // TRUE if vocoders are automatically disabld via a MPHC_STOP_DEDICATED_REQ, FALSE otherwise.
   } T_L1A_VOCODER_CFG_GLOBAL;
-#endif // AUDIO_TASK == 1
+#endif // L1_VOCODER_IF_CHANGE == 1
   typedef struct
   {
     UWORD8 outen1;
@@ -3639,7 +3636,7 @@
     UWORD8 command_commited;  /* updated in I2c ISR callback context*/
   } T_OUTEN_CFG_TASK;
 
-#endif //L1_VOCODER_IF_CHANGE == 1
+#endif // AUDIO_TASK == 1
 /***************************************************************************************/
 /* L1A global variable structure...                                                    */
 /***************************************************************************************/