diff --git a/AMBEFEC.h b/AMBEFEC.h
index f7ee153..04a8b94 100644
--- a/AMBEFEC.h
+++ b/AMBEFEC.h
@@ -16,7 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef	AMBEFEC_H
+#if !defined(AMBEFEC_H)
 #define	AMBEFEC_H
 
 class CAMBEFEC {
diff --git a/DMRDefines.h b/DMRDefines.h
index f9eafbf..1b31a45 100644
--- a/DMRDefines.h
+++ b/DMRDefines.h
@@ -82,8 +82,6 @@ const unsigned char DT_VOICE_PI_HEADER    = 0x00U;
 const unsigned char DT_VOICE_LC_HEADER    = 0x01U;
 const unsigned char DT_TERMINATOR_WITH_LC = 0x02U;
 const unsigned char DT_CSBK               = 0x03U;
-const unsigned char DT_MBC_HEADER         = 0x04U;
-const unsigned char DT_MBC_CONTINUATION   = 0x05U;
 const unsigned char DT_DATA_HEADER        = 0x06U;
 const unsigned char DT_RATE_12_DATA       = 0x07U;
 const unsigned char DT_RATE_34_DATA       = 0x08U;
diff --git a/Defines.h b/Defines.h
index c050cc6..97897fb 100644
--- a/Defines.h
+++ b/Defines.h
@@ -38,7 +38,6 @@ enum RPT_RF_STATE {
 
 enum RPT_NET_STATE {
 	RS_NET_IDLE,
-	RS_NET_LATE_ENTRY,
 	RS_NET_AUDIO,
 	RS_NET_DATA
 };