--- a/gsm-fw/L1/dsp/leadapi.c	Fri Aug 15 22:15:05 2014 +0000
+++ b/gsm-fw/L1/dsp/leadapi.c	Fri Aug 15 22:29:30 2014 +0000
@@ -33,17 +33,11 @@
 
 #define LEADAPI_C  1
 
-#include "l1sw.cfg"
-#include "chipset.cfg"
+#include "../../include/config.h"
+#include "../../include/sys_types.h"
 
-#if (OP_L1_STANDALONE == 0)
-  #include "main/sys_types.h"
-#else
-  #include "sys_types.h"
-#endif
-
-#include "memif/mem.h"
-#include "clkm/clkm.h"
+#include "../../bsp/mem.h"
+#include "../../bsp/clkm.h"
 #include "leadapi.h"
 
 
@@ -329,11 +323,10 @@
   else {
     error = LA_BAD_TAG;
   }
-  
-/*  if (error != NULL) { */                               // if an error was detected in the coff2c format,
+
+  if (error != NULL)                                  // if an error was detected in the coff2c format,
     error = LA_LoadPage16(code, page, start);         // try to download a coff-v1.0 coff2c output
     return(error);                                    // and return its result
-/*  } */
 }