Add core stack headers into bacdef.h and cleanup includes. (#602)

* Added dependent BACnet stack headers into bacdef.h file.

* Changed bacdef.h and other stack includes in c/h files to have a common pattern.

* Moved bits.h, bytes.h, and bacnet_stack_exports.h under bacnet/basic/sys/ folder.

src/bacnet/datalink/arcnet.h

@@ -27,8 +27,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/npdu.h"
 
 /* specific defines for ARCNET */

src/bacnet/datalink/automac.c

@@ -9,10 +9,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
-#include "bacnet/config.h"
 #include "bacnet/datalink/mstpdef.h"
 #include "bacnet/datalink/automac.h"
 

src/bacnet/datalink/automac.h

@@ -29,7 +29,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 /* MS/TP Auto MAC address functionality */
 /* starting number available for AutoMAC */

src/bacnet/datalink/bacsec.h

@@ -38,10 +38,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 typedef struct BACnet_Security_Wrapper {
     bool payload_net_or_bvll_flag;      /* true if NPDU or BVLL */

src/bacnet/datalink/bip.h

@@ -27,8 +27,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/npdu.h"
 #include "bacnet/datalink/bvlc.h"
 

src/bacnet/datalink/bip6.h

@@ -16,8 +16,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/npdu.h"
 #include "bacnet/datalink/bvlc6.h"
 

src/bacnet/datalink/bvlc.c

@@ -35,10 +35,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacint.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/hostnport.h"
 #include "bacnet/datalink/bvlc.h"
 

src/bacnet/datalink/bvlc.h

@@ -27,7 +27,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/npdu.h"
 
 /**

src/bacnet/datalink/bvlc6.h

@@ -12,8 +12,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/npdu.h"
 
 /**

src/bacnet/datalink/cobs.h

@@ -26,8 +26,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 /* number of bytes needed for COBS encoded CRC */
 #define COBS_ENCODED_CRC_SIZE 5

src/bacnet/datalink/crc.h

@@ -26,8 +26,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 #ifdef __cplusplus
 extern "C" {

src/bacnet/datalink/datalink.h

@@ -24,9 +24,8 @@
 #ifndef DATALINK_H
 #define DATALINK_H
 
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 #if defined(BACDL_ETHERNET)
 #include "bacnet/datalink/ethernet.h"

src/bacnet/datalink/dlenv.c

@@ -28,8 +28,9 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/apdu.h"
 #include "bacnet/datalink/datalink.h"
 #include "bacnet/basic/services.h"

src/bacnet/datalink/dlenv.h

@@ -27,11 +27,11 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/datalink/bvlc.h"
 
-#include "bacnet/bacnet_stack_exports.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

src/bacnet/datalink/dlmstp.c

@@ -11,16 +11,16 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <string.h>
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/basic/sys/ringbuf.h"
 #include "bacnet/basic/sys/mstimer.h"
 #include "bacnet/datalink/crc.h"
 #include "bacnet/datalink/mstp.h"
 #include "bacnet/datalink/dlmstp.h"
 #include "bacnet/datalink/mstpdef.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/npdu.h"
-#include "bacnet/bits.h"
-#include "bacnet/bytes.h"
 #include "bacnet/bacaddr.h"
 
 /* the current MSTP port that the datalink is using */

src/bacnet/datalink/dlmstp.h

@@ -27,8 +27,9 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/basic/sys/ringbuf.h"
 #include "bacnet/datalink/mstpdef.h"
 #include "bacnet/npdu.h"

src/bacnet/datalink/ethernet.h

@@ -27,8 +27,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/npdu.h"
 
 /* specific defines for Ethernet */

src/bacnet/datalink/mstp.c

@@ -59,10 +59,6 @@
 #include "bacnet/datalink/crc.h"
 #include "bacnet/datalink/mstptext.h"
 #include "bacnet/npdu.h"
-
-#ifndef DEBUG_ENABLED
-#define DEBUG_ENABLED 0
-#endif
 #include "bacnet/basic/sys/debug.h"
 
 #if PRINT_ENABLED

src/bacnet/datalink/mstp.h

@@ -28,10 +28,10 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/datalink/mstpdef.h"
-#include "bacnet/config.h"
 
 /* Repeater turnoff delay. The duration of a continuous logical one state */
 /* at the active input port of an MS/TP repeater after which the repeater */

src/bacnet/datalink/mstpdef.h

@@ -27,7 +27,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 /*  The value 255 is used to denote broadcast when used as a */
 /* destination address but is not allowed as a value for a station. */

src/bacnet/datalink/mstptext.h

@@ -24,8 +24,8 @@
 #ifndef MSTPTEXT_H
 #define MSTPTEXT_H
 
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 #ifdef __cplusplus
 extern "C" {