--- a/gsm-fw/L1/include/l1_types.h	Tue Jul 15 22:19:53 2014 +0000
+++ b/gsm-fw/L1/include/l1_types.h	Fri Aug 01 16:38:35 2014 +0000
@@ -10,14 +10,21 @@
 //--------------------------------------
 // Basic DATA types used along L1 code.
 //--------------------------------------
+
+#ifndef __L1_TYPES_H__
+  #define __L1_TYPES_H__
+
 #if !defined (BOOL_FLAG)
   #define BOOL_FLAG
   typedef unsigned char  BOOL;
-#endif
+#endif /* #if !defined (BOOL_FLAG) */
 
-
+#if (OP_L1_STANDALONE == 1)
+ 
+ 
 #if !defined (NUCLEUS) && !defined CHAR_FLAG
   #define CHAR_FLAG
+
   typedef          char  CHAR;
 #endif
 
@@ -30,9 +37,17 @@
 typedef unsigned long  UWORD32;
 typedef          long  WORD32;
 //--------------------------------------
+ 
+
+#else
+  #include "global_types.h"
+#endif /* #if (OP_L1_STANDALONE == 1) */
+
+
+
+
 
 typedef volatile UWORD16  API;
 typedef volatile WORD16   API_SIGNED;
-
+#endif /* #ifndef __L1_TYPES_H__ */
 
-