diff --git a/src/include/nfc_target.h b/src/include/nfc_target.h
index b5bd586..eef3e5b 100644
--- a/src/include/nfc_target.h
+++ b/src/include/nfc_target.h
@@ -174,9 +174,6 @@
 ** NFC
 **
 ******************************************************************************/
-#ifndef NFC_INCLUDED
-#define NFC_INCLUDED TRUE
-#endif
 
 /* Define to TRUE to include Broadcom Vendor Specific implementation */
 #ifndef NFC_BRCM_VS_INCLUDED
@@ -509,10 +506,6 @@
 **
 ******************************************************************************/
 
-#ifndef NFA_INCLUDED
-#define NFA_INCLUDED TRUE
-#endif
-
 #ifndef NFA_P2P_INCLUDED
 #define NFA_P2P_INCLUDED TRUE
 #endif
diff --git a/src/nfc/nci/nci_hmsgs.c b/src/nfc/nci/nci_hmsgs.c
index a8195bd..7cecea5 100644
--- a/src/nfc/nci/nci_hmsgs.c
+++ b/src/nfc/nci/nci_hmsgs.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nci_defs.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -627,5 +626,3 @@
 }
 #endif
 #endif
-
-#endif /* NFC_INCLUDED == TRUE*/
diff --git a/src/nfc/nci/nci_hrcv.c b/src/nfc/nci/nci_hrcv.c
index 22bc670..1b64384 100644
--- a/src/nfc/nci/nci_hrcv.c
+++ b/src/nfc/nci/nci_hrcv.c
@@ -27,7 +27,6 @@
 #include "gki.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nci_defs.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -465,5 +464,3 @@
     }
   }
 }
-
-#endif /* NFC_INCLUDED == TRUE*/
diff --git a/src/nfc/nfc/nfc_ee.c b/src/nfc/nfc/nfc_ee.c
index 2dac7cf..c2c4115 100644
--- a/src/nfc/nfc/nfc_ee.c
+++ b/src/nfc/nfc/nfc_ee.c
@@ -26,7 +26,6 @@
 #include "gki.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
 #include "nfc_int.h"
@@ -106,5 +105,3 @@
 **
 *******************************************************************************/
 tNFC_STATUS NFC_GetRouting(void) { return nci_snd_get_routing_cmd(); }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/nfc/nfc_main.c b/src/nfc/nfc/nfc_main.c
index 04cd2ef..2f9c214 100644
--- a/src/nfc/nfc/nfc_main.c
+++ b/src/nfc/nfc/nfc_main.c
@@ -28,7 +28,6 @@
 #include "gki.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "ce_int.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -1331,5 +1330,3 @@
   }
 }
 #endif
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c
index d901914..0780671 100644
--- a/src/nfc/nfc/nfc_ncif.c
+++ b/src/nfc/nfc/nfc_ncif.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nci_defs.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -1443,5 +1442,3 @@
   }
   GKI_freebuf(p_msg);
 }
-
-#endif /* NFC_INCLUDED == TRUE*/
diff --git a/src/nfc/nfc/nfc_task.c b/src/nfc/nfc/nfc_task.c
index 041818e..789aca2 100644
--- a/src/nfc/nfc/nfc_task.c
+++ b/src/nfc/nfc/nfc_task.c
@@ -26,7 +26,6 @@
 #include "gki.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "ce_int.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -39,10 +38,8 @@
 #define llcp_cleanup()
 #endif
 
-#if (NFA_INCLUDED == TRUE)
 #include "nfa_dm_int.h"
 #include "nfa_sys.h"
-#endif
 
 /*******************************************************************************
 **
@@ -319,9 +316,7 @@
     /* Stop the timers */
     GKI_stop_timer(NFC_TIMER_ID);
     GKI_stop_timer(NFC_QUICK_TIMER_ID);
-#if (NFA_INCLUDED == TRUE)
     GKI_stop_timer(NFA_TIMER_ID);
-#endif
   }
 }
 
@@ -407,7 +402,6 @@
       nfc_process_quick_timer_evt();
     }
 
-#if (NFA_INCLUDED == TRUE)
     if (event & NFA_MBOX_EVT_MASK) {
       while ((p_msg = (NFC_HDR*)GKI_read_mbox(NFA_MBOX_ID)) != NULL) {
         nfa_sys_event(p_msg);
@@ -417,7 +411,6 @@
     if (event & NFA_TIMER_EVT_MASK) {
       nfa_sys_timer_update();
     }
-#endif
   }
 
   NFC_TRACE_DEBUG0("nfc_task terminated");
@@ -425,5 +418,3 @@
   GKI_exit_task(GKI_get_taskid());
   return 0;
 }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/nfc/nfc_test.c b/src/nfc/nfc/nfc_test.c
index 89923b0..0f23345 100644
--- a/src/nfc/nfc/nfc_test.c
+++ b/src/nfc/nfc/nfc_test.c
@@ -28,7 +28,6 @@
 #include "gki.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nci_hmsgs.h"
 #include "nfc_int.h"
 
@@ -63,5 +62,3 @@
 
   return status;
 }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/nfc/nfc_utils.c b/src/nfc/nfc/nfc_utils.c
index 7dcf20c..290af0f 100644
--- a/src/nfc/nfc/nfc_utils.c
+++ b/src/nfc/nfc/nfc_utils.c
@@ -27,7 +27,6 @@
 #include "nfc_api.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nfc_int.h"
 
 /*******************************************************************************
@@ -186,5 +185,3 @@
     }
   }
 }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/nfc/nfc_vs.c b/src/nfc/nfc/nfc_vs.c
index d3160da..7f8be28 100644
--- a/src/nfc/nfc/nfc_vs.c
+++ b/src/nfc/nfc/nfc_vs.c
@@ -27,7 +27,6 @@
 #include "gki.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nfc_int.h"
 
 /****************************************************************************
@@ -122,5 +121,3 @@
   nfc_ncif_check_cmd_queue(p_data);
   return status;
 }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/tags/ce_main.c b/src/nfc/tags/ce_main.c
index 7a0fdc6..cf207cb 100644
--- a/src/nfc/tags/ce_main.c
+++ b/src/nfc/tags/ce_main.c
@@ -27,7 +27,6 @@
 #include "bt_types.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "ce_api.h"
 #include "ce_int.h"
 #include "gki.h"
@@ -138,5 +137,3 @@
 
   return (ce_cb.trace_level);
 }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/tags/ce_t3t.c b/src/nfc/tags/ce_t3t.c
index 8b9b264..cd1ae00 100644
--- a/src/nfc/tags/ce_t3t.c
+++ b/src/nfc/tags/ce_t3t.c
@@ -27,7 +27,6 @@
 #include "nfc_target.h"
 #include "trace_api.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "ce_api.h"
 #include "ce_int.h"
 #include "gki.h"
@@ -986,5 +985,3 @@
 
   return (retval);
 }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/tags/ce_t4t.c b/src/nfc/tags/ce_t4t.c
index 2955195..f641c77 100644
--- a/src/nfc/tags/ce_t4t.c
+++ b/src/nfc/tags/ce_t4t.c
@@ -27,7 +27,6 @@
 #include "nfc_target.h"
 #include "trace_api.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "ce_api.h"
 #include "ce_int.h"
 #include "gki.h"
@@ -1058,4 +1057,3 @@
   return NFC_STATUS_FAILED;
 #endif
 }
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/tags/rw_i93.c b/src/nfc/tags/rw_i93.c
index 2e3b2b9..5778cfd 100644
--- a/src/nfc/tags/rw_i93.c
+++ b/src/nfc/tags/rw_i93.c
@@ -27,8 +27,6 @@
 #include "nfc_target.h"
 #include "trace_api.h"
 
-#if (NFC_INCLUDED == TRUE)
-
 #include "nfc_api.h"
 #include "nfc_int.h"
 #include "rw_api.h"
@@ -3837,5 +3835,3 @@
 }
 
 #endif
-
-#endif /* (NFC_INCLUDED == TRUE) */
diff --git a/src/nfc/tags/rw_main.c b/src/nfc/tags/rw_main.c
index 9c94237..04ee723 100644
--- a/src/nfc/tags/rw_main.c
+++ b/src/nfc/tags/rw_main.c
@@ -27,7 +27,6 @@
 #include "bt_types.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
 #include "rw_api.h"
@@ -272,5 +271,3 @@
 
   return (rw_cb.trace_level);
 }
-
-#endif /* NFC_INCLUDED == TRUE */
diff --git a/src/nfc/tags/rw_t1t.c b/src/nfc/tags/rw_t1t.c
index 619a78e..6d685b8 100644
--- a/src/nfc/tags/rw_t1t.c
+++ b/src/nfc/tags/rw_t1t.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "gki.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -1117,5 +1116,3 @@
 }
 
 #endif /* (BT_TRACE_VERBOSE == TRUE) */
-
-#endif /* (NFC_INCLUDED == TRUE) */
diff --git a/src/nfc/tags/rw_t1t_ndef.c b/src/nfc/tags/rw_t1t_ndef.c
index 5d6185c..915dade 100644
--- a/src/nfc/tags/rw_t1t_ndef.c
+++ b/src/nfc/tags/rw_t1t_ndef.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "gki.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -2575,5 +2574,3 @@
 #endif /* (BT_TRACE_VERBOSE == TRUE) */
 
 #endif /* (RW_NDEF_INCLUDED == TRUE) */
-
-#endif /* (NFC_INCLUDED == TRUE) */
diff --git a/src/nfc/tags/rw_t2t.c b/src/nfc/tags/rw_t2t.c
index bb56e7b..c215340 100644
--- a/src/nfc/tags/rw_t2t.c
+++ b/src/nfc/tags/rw_t2t.c
@@ -26,7 +26,6 @@
 #include "bt_types.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "gki.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -1125,5 +1124,3 @@
 }
 
 #endif /* (BT_TRACE_VERBOSE == TRUE) */
-
-#endif /* NFC_INCLUDED == TRUE*/
diff --git a/src/nfc/tags/rw_t2t_ndef.c b/src/nfc/tags/rw_t2t_ndef.c
index 626f653..2752963 100644
--- a/src/nfc/tags/rw_t2t_ndef.c
+++ b/src/nfc/tags/rw_t2t_ndef.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "gki.h"
 #include "nci_hmsgs.h"
 #include "nfc_api.h"
@@ -3028,5 +3027,3 @@
 }
 
 #endif /* (RW_NDEF_INCLUDED == TRUE) */
-
-#endif /* (NFC_INCLUDED == TRUE) */
diff --git a/src/nfc/tags/rw_t4t.c b/src/nfc/tags/rw_t4t.c
index dbc35e0..f0ac0b9 100644
--- a/src/nfc/tags/rw_t4t.c
+++ b/src/nfc/tags/rw_t4t.c
@@ -27,8 +27,6 @@
 #include "nfc_target.h"
 #include "trace_api.h"
 
-#if (NFC_INCLUDED == TRUE)
-
 #include "gki.h"
 #include "nfc_api.h"
 #include "nfc_int.h"
@@ -2282,5 +2280,3 @@
   }
 }
 #endif
-
-#endif /* (NFC_INCLUDED == TRUE) */
diff --git a/src/nfc/tags/tags_int.c b/src/nfc/tags/tags_int.c
index 2abb452..b99d63d 100644
--- a/src/nfc/tags/tags_int.c
+++ b/src/nfc/tags/tags_int.c
@@ -25,7 +25,6 @@
 #include "bt_types.h"
 #include "nfc_target.h"
 
-#if (NFC_INCLUDED == TRUE)
 #include "nfc_api.h"
 #include "rw_api.h"
 #include "rw_int.h"
@@ -322,5 +321,3 @@
 
   return (tags_ones32(x) - 1);
 }
-
-#endif /* NFC_INCLUDED == TRUE*/