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/abort.c

@@ -32,9 +32,10 @@
  -------------------------------------------
 ####COPYRIGHTEND####*/
 #include <stdint.h>
-#include "bacnet/bacenum.h"
-#include "bacnet/bacdcode.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/bacdcode.h"
 #include "bacnet/abort.h"
 
 /** @file abort.c  Abort Encoding/Decoding */

src/bacnet/abort.h

@@ -26,9 +26,8 @@
 
 #include <stdint.h>
 #include <stdbool.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"
 
 #ifdef __cplusplus
 extern "C" {

src/bacnet/access_rule.h

@@ -28,8 +28,9 @@
 
 #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/bacapp.h"
 #include "bacnet/bacdevobjpropref.h"
 

src/bacnet/alarm_ack.h

@@ -26,9 +26,9 @@
 
 #include <stdint.h>
 #include <stdbool.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"
+/* BACnet Stack API */
 #include "bacnet/bacapp.h"
 #include "bacnet/timestamp.h"
 

src/bacnet/apdu.h

@@ -26,8 +26,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 typedef struct _confirmed_service_data {
     bool segmented_message;

src/bacnet/arf.c

@@ -32,9 +32,10 @@
  -------------------------------------------
 ####COPYRIGHTEND####*/
 #include <stdint.h>
-#include "bacnet/bacenum.h"
-#include "bacnet/bacdcode.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/bacdcode.h"
 #include "bacnet/arf.h"
 
 /** @file arf.c  Atomic Read File */

src/bacnet/arf.h

@@ -26,8 +26,9 @@
 
 #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/bacdcode.h"
 #include "bacnet/bacstr.h"
 

src/bacnet/assigned_access_rights.h

@@ -28,8 +28,9 @@
 
 #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/bacapp.h"
 #include "bacnet/bacdevobjpropref.h"
 

src/bacnet/authentication_factor.h

@@ -28,8 +28,9 @@
 
 #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/bacapp.h"
 
 typedef struct {

src/bacnet/authentication_factor_format.h

@@ -28,8 +28,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"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 typedef struct {
     BACNET_AUTHENTICATION_FACTOR_TYPE format_type;

src/bacnet/awf.c

@@ -32,9 +32,10 @@
  -------------------------------------------
 ####COPYRIGHTEND####*/
 #include <stdint.h>
-#include "bacnet/bacenum.h"
-#include "bacnet/bacdcode.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/bacdcode.h"
 #include "bacnet/awf.h"
 
 /** @file awf.c  Atomic Write File */

src/bacnet/awf.h

@@ -26,8 +26,9 @@
 
 #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/bacdcode.h"
 
 #ifndef BACNET_WRITE_FILE_RECORD_COUNT

src/bacnet/bacaddr.c

@@ -36,9 +36,10 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
-#include "bacnet/config.h"
-#include "bacnet/bacdcode.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/bacdcode.h"
 #include "bacnet/bacint.h"
 #include "bacnet/bacstr.h"
 #include "bacnet/bacaddr.h"

src/bacnet/bacaddr.h

@@ -27,9 +27,8 @@
 #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"
-#include "bacnet/basic/sys/platform.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
 
 #ifdef __cplusplus
 extern "C" {

src/bacnet/bacapp.h

@@ -27,8 +27,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.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/bacdest.h"
 #include "bacnet/bacint.h"
 #include "bacnet/bacstr.h"

src/bacnet/bacdcode.c

@@ -33,11 +33,10 @@
 ####COPYRIGHTEND####*/
 
 #include <string.h>
-
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
-#include "bacnet/bits.h"
 #include "bacnet/bacstr.h"
 #include "bacnet/bacint.h"
 #include "bacnet/bacreal.h"

src/bacnet/bacdcode.h

@@ -27,14 +27,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/basic/sys/platform.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/datetime.h"
 #include "bacnet/bacstr.h"
 #include "bacnet/bacint.h"
 #include "bacnet/bacreal.h"
-#include "bacnet/bits.h"
 
 /**
  * @brief Encode a BACnetARRAY property element; a function template

src/bacnet/bacdef.h

@@ -1,39 +1,27 @@
-/**************************************************************************
-*
-* Copyright (C) 2012 Steve Karg <skarg@users.sourceforge.net>
-*
-* Permission is hereby granted, free of charge, to any person obtaining
-* a copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to
-* permit persons to whom the Software is furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
-* in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*********************************************************************/
+/**
+ * @file
+ * @brief Core BACnet defines and enumerations and structures
+ * @author Steve Karg <skarg@users.sourceforge.net>
+ * @date 2004
+ * @copyright 2004 Steve Karg <skarg@users.sourceforge.net>
+ *
+ * SPDX-License-Identifier: MIT
+ */
 #ifndef BACDEF_H
 #define BACDEF_H
 
 #include <stddef.h>
 #include <stdint.h>
+/* config is always first to allow developers to override */
 #include "bacnet/config.h"
+/* BACnet Stack core enumerations */
 #include "bacnet/bacenum.h"
-
-#if defined(_MSC_VER)
-/* Silence the warnings about unsafe versions of library functions */
-/* as we need to keep the code portable */
-#pragma warning( disable : 4996)
-#endif
+/* BACnet Stack libc and compiler abstraction */
+#include "bacnet/basic/sys/platform.h"
+#include "bacnet/basic/sys/bacnet_stack_exports.h"
+/* BACnet Stack common helper macros */
+#include "bacnet/basic/sys/bits.h"
+#include "bacnet/basic/sys/bytes.h"
 
 /* This stack implements this version of BACnet */
 #define BACNET_PROTOCOL_VERSION 1
@@ -51,14 +39,14 @@
 #define MAX_ASHRAE_OBJECT_TYPE 21
 #define MAX_BACNET_SERVICES_SUPPORTED 37
 #elif (BACNET_PROTOCOL_REVISION == 2)
-    /* from 135-2001 version of the BACnet Standard */
+/* from 135-2001 version of the BACnet Standard */
 #define MAX_ASHRAE_OBJECT_TYPE 23
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 3)
 #define MAX_ASHRAE_OBJECT_TYPE 23
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 4)
-    /* from 135-2004 version of the BACnet Standard */
+/* from 135-2004 version of the BACnet Standard */
 #define MAX_ASHRAE_OBJECT_TYPE 25
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 5)
@@ -74,7 +62,7 @@
 #define MAX_ASHRAE_OBJECT_TYPE 31
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 9)
-    /* from 135-2008 version of the BACnet Standard */
+/* from 135-2008 version of the BACnet Standard */
 #define MAX_ASHRAE_OBJECT_TYPE 38
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 10)
@@ -84,42 +72,42 @@
 #define MAX_ASHRAE_OBJECT_TYPE 51
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 12)
-    /* from 135-2010 version of the BACnet Standard */
+/* from 135-2010 version of the BACnet Standard */
 #define MAX_ASHRAE_OBJECT_TYPE 51
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 13)
 #define MAX_ASHRAE_OBJECT_TYPE 53
 #define MAX_BACNET_SERVICES_SUPPORTED 40
 #elif (BACNET_PROTOCOL_REVISION == 14) || (BACNET_PROTOCOL_REVISION == 15)
-    /* from 135-2012 version of the BACnet Standard */
+/* from 135-2012 version of the BACnet Standard */
 #define MAX_ASHRAE_OBJECT_TYPE 55
 #define MAX_BACNET_SERVICES_SUPPORTED 41
 #elif (BACNET_PROTOCOL_REVISION == 16)
-    /* Addendum 135-2012an, 135-2012at, 135-2012au,
-       135-2012av, 135-2012aw, 135-2012ax, 135-2012az */
+/* Addendum 135-2012an, 135-2012at, 135-2012au,
+   135-2012av, 135-2012aw, 135-2012ax, 135-2012az */
 #define MAX_ASHRAE_OBJECT_TYPE 56
 #define MAX_BACNET_SERVICES_SUPPORTED 41
 #elif (BACNET_PROTOCOL_REVISION == 17)
-    /* Addendum 135-2012ai */
+/* Addendum 135-2012ai */
 #define MAX_ASHRAE_OBJECT_TYPE 57
 #define MAX_BACNET_SERVICES_SUPPORTED 41
 #elif (BACNET_PROTOCOL_REVISION == 18) || (BACNET_PROTOCOL_REVISION == 19)
-    /* from 135-2016 version of the BACnet Standard */
+/* from 135-2016 version of the BACnet Standard */
 #define MAX_ASHRAE_OBJECT_TYPE 60
 #define MAX_BACNET_SERVICES_SUPPORTED 44
 #elif (BACNET_PROTOCOL_REVISION == 20) || (BACNET_PROTOCOL_REVISION == 21)
-    /* Addendum 135-2016bd, 135-2016be, 135-2016bi */
+/* Addendum 135-2016bd, 135-2016be, 135-2016bi */
 #define MAX_ASHRAE_OBJECT_TYPE 63
 #define MAX_BACNET_SERVICES_SUPPORTED 47
 #elif (BACNET_PROTOCOL_REVISION == 22)
 #define MAX_ASHRAE_OBJECT_TYPE 63
 #define MAX_BACNET_SERVICES_SUPPORTED 47
 #elif (BACNET_PROTOCOL_REVISION == 23)
-    /* Addendum 135-2020cd */
+/* Addendum 135-2020cd */
 #define MAX_ASHRAE_OBJECT_TYPE 63
 #define MAX_BACNET_SERVICES_SUPPORTED 47
 #elif (BACNET_PROTOCOL_REVISION == 24)
-    /* Addendum 135-2020ca, 135-2020cc, 135-2020bv */
+/* Addendum 135-2020ca, 135-2020cc, 135-2020bv */
 #define MAX_ASHRAE_OBJECT_TYPE 65
 #define MAX_BACNET_SERVICES_SUPPORTED 47
 #else
@@ -145,7 +133,7 @@ typedef uint32_t BACNET_UNSIGNED_INTEGER;
 #define BACNET_ARRAY_ALL UINT32_MAX
 typedef uint32_t BACNET_ARRAY_INDEX;
 /* For device object property references with no device id defined */
-#define BACNET_NO_DEV_ID   0xFFFFFFFFu
+#define BACNET_NO_DEV_ID 0xFFFFFFFFu
 #define BACNET_NO_DEV_TYPE OBJECT_NONE
 /* Priority Array for commandable objects */
 #define BACNET_NO_PRIORITY 0
@@ -173,16 +161,16 @@ struct BACnet_Device_Address {
     /* DNET,DLEN,DADR or SNET,SLEN,SADR */
     /* the following are used if the device is behind a router */
     /* net = 0 indicates local */
-    uint16_t net;       /* BACnet network number */
+    uint16_t net; /* BACnet network number */
     /* LEN = 0 denotes broadcast MAC ADR and ADR field is absent */
     /* LEN > 0 specifies length of ADR field */
-    uint8_t len;        /* length of MAC address */
-    uint8_t adr[MAX_MAC_LEN];   /* hwaddr (MAC) address */
+    uint8_t len; /* length of MAC address */
+    uint8_t adr[MAX_MAC_LEN]; /* hwaddr (MAC) address */
 };
 typedef struct BACnet_Device_Address BACNET_ADDRESS;
 /* define a MAC address for manipulation */
 struct BACnet_MAC_Address {
-    uint8_t len;        /* length of MAC address */
+    uint8_t len; /* length of MAC address */
     uint8_t adr[MAX_MAC_LEN];
 };
 typedef struct BACnet_MAC_Address BACNET_MAC_ADDRESS;
@@ -195,12 +183,16 @@ typedef struct BACnet_Object_Id {
     uint32_t instance;
 } BACNET_OBJECT_ID;
 
-#define MAX_NPDU (1+1+2+1+MAX_MAC_LEN+2+1+MAX_MAC_LEN+1+1+2)
+#define MAX_NPDU (1 + 1 + 2 + 1 + MAX_MAC_LEN + 2 + 1 + MAX_MAC_LEN + 1 + 1 + 2)
 #define MAX_PDU (MAX_APDU + MAX_NPDU)
 
-#define BACNET_ID_VALUE(bacnet_object_instance, bacnet_object_type) ((((bacnet_object_type) & BACNET_MAX_OBJECT) << BACNET_INSTANCE_BITS) | ((bacnet_object_instance) & BACNET_MAX_INSTANCE))
-#define BACNET_INSTANCE(bacnet_object_id_num) ((bacnet_object_id_num)&BACNET_MAX_INSTANCE)
-#define BACNET_TYPE(bacnet_object_id_num) (((bacnet_object_id_num) >> BACNET_INSTANCE_BITS ) & BACNET_MAX_OBJECT)
+#define BACNET_ID_VALUE(bacnet_object_instance, bacnet_object_type)       \
+    ((((bacnet_object_type)&BACNET_MAX_OBJECT) << BACNET_INSTANCE_BITS) | \
+        ((bacnet_object_instance)&BACNET_MAX_INSTANCE))
+#define BACNET_INSTANCE(bacnet_object_id_num) \
+    ((bacnet_object_id_num)&BACNET_MAX_INSTANCE)
+#define BACNET_TYPE(bacnet_object_id_num) \
+    (((bacnet_object_id_num) >> BACNET_INSTANCE_BITS) & BACNET_MAX_OBJECT)
 
 #define BACNET_STATUS_OK (0)
 #define BACNET_STATUS_ERROR (-1)

src/bacnet/bacdest.c

@@ -16,13 +16,14 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <math.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacaddr.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacdest.h"
 #include "bacnet/basic/binding/address.h"
-#include "bacdest.h"
 
 /**
  * @brief Initialize the BACnetDestination data structure with defaults

src/bacnet/bacdest.h

@@ -14,9 +14,9 @@
 
 #include <stdint.h>
 #include <stdbool.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"
+/* BACnet Stack API */
 #include "bacnet/bacstr.h"
 #include "bacnet/datetime.h"
 

src/bacnet/bacdevobjpropref.h

@@ -28,11 +28,10 @@
 #include <stdint.h>
 #include <stdbool.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/bacint.h"
-#include "bacnet/bacenum.h"
-#include "bacnet/basic/sys/platform.h"
 
 typedef struct BACnetDeviceObjectPropertyReference {
     /* number type first to avoid enum cast warning on = { 0 } */

src/bacnet/bacerror.c

@@ -32,9 +32,10 @@
  -------------------------------------------
 ####COPYRIGHTEND####*/
 #include <stdint.h>
-#include "bacnet/bacenum.h"
-#include "bacnet/bacdcode.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/bacdcode.h"
 #include "bacnet/bacerror.h"
 
 /** @file bacerror.c  Encode/Decode BACnet Errors */

src/bacnet/bacerror.h

@@ -26,9 +26,8 @@
 
 #include <stdint.h>
 #include <stdbool.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"
 
 #ifdef __cplusplus
 extern "C" {

src/bacnet/bacint.c

@@ -36,7 +36,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacint.h"
 
 /** @file bacint.c  Encode/Decode Integer Types */

src/bacnet/bacint.h

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <stdbool.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"
 
 #ifdef __cplusplus
 extern "C" {

src/bacnet/bacprop.h

@@ -26,9 +26,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 {
     signed prop_id;     /* index number that matches the text */

src/bacnet/bacpropstates.h

@@ -26,9 +26,9 @@
 
 #include <stdint.h>
 #include <stdbool.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"
+/* BACnet Stack API */
 #include "bacnet/bacapp.h"
 #include "bacnet/timestamp.h"
 

src/bacnet/bacreal.c

@@ -33,11 +33,10 @@
 ####COPYRIGHTEND####*/
 
 #include <string.h>
-
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
-#include "bacnet/bits.h"
 #include "bacnet/bacstr.h"
 #include "bacnet/bacint.h"
 #include "bacnet/bacreal.h"

src/bacnet/bacreal.h

@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <stdbool.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"
 
 #ifdef __cplusplus
 extern "C" {

src/bacnet/bacstr.c

@@ -38,19 +38,10 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacstr.h"
-#include "bacnet/bits.h"
-
-/* TODO: For some reason my Zephyr build for non-native targets does not
- *       see a definition for strnlen(), but it is visible in when
- *       compiling for native_posix. This results in the compiler
- *       emitting a warning, forcing Zephyr's sanitycheck() script to stop.
- *       Until this is chased down, the definition is being provided here.
- */
-#if __ZEPHYR__ && !CONFIG_NATIVE_APPLICATION
-size_t strnlen(const char *, size_t);
-#endif
 
 /** @file bacstr.c  Manipulate Bit/Char/Octet Strings */
 #ifndef BACNET_STRING_UTF8_VALIDATION

src/bacnet/bacstr.h

@@ -27,9 +27,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.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"
 
 /* bit strings
    They could be as large as 256/8=32 octets */

src/bacnet/bactext.h

@@ -31,8 +31,9 @@
 
 #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/indtext.h"
 
 #ifdef __cplusplus

src/bacnet/bactimevalue.h

@@ -28,10 +28,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/basic/sys/platform.h"
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacint.h"
 #include "bacnet/datetime.h"
 

src/bacnet/basic/bbmd/h_bbmd.h

@@ -32,8 +32,9 @@
 #include <stdint.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/datalink/bvlc.h"
 
 #ifdef __cplusplus

src/bacnet/basic/bbmd6/h_bbmd6.h

@@ -32,8 +32,9 @@
 #include <stdint.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/datalink/bvlc6.h"
 
 #ifdef __cplusplus

src/bacnet/basic/bbmd6/vmac.c

@@ -36,7 +36,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "bacnet/config.h"
 #include "bacnet/bacdef.h"
 #include "bacnet/basic/sys/keylist.h"
 /* me! */

src/bacnet/basic/bbmd6/vmac.h

@@ -8,8 +8,8 @@
 
 #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"
 
 /* define the max MAC as big as IPv6 + port number */
 #define VMAC_MAC_MAX 18

src/bacnet/basic/binding/address.c

@@ -36,14 +36,13 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "bacnet/bits.h"
-#include "bacnet/config.h"
-#include "bacnet/bacaddr.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/bacaddr.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/readrange.h"
 #include "bacnet/basic/binding/address.h"
-#include "bacnet/basic/binding/address.h"
 
 /* we are likely compiling the demo command line tools if print enabled */
 #if !defined(BACNET_ADDRESS_CACHE_FILE)

src/bacnet/basic/binding/address.h

@@ -27,8 +27,9 @@
 #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/bacaddr.h"
 #include "bacnet/readrange.h"
 

src/bacnet/basic/client/bac-data.c

@@ -9,8 +9,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
-#include "bacnet/bacenum.h"
+/* BACnet Stack API */
 #include "bacnet/basic/sys/mstimer.h"
 /* us */
 #include "bacnet/basic/client/bac-rw.h"

src/bacnet/basic/client/bac-data.h

@@ -9,11 +9,11 @@
 #define BAC_DATA_H
 
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacapp.h"
 #include "bacnet/rp.h"
-#include "bacnet/bacnet_stack_exports.h"
 
 struct bacnet_status_flags_t {
     bool in_alarm : 1;

src/bacnet/basic/client/bac-discover.c

@@ -12,8 +12,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
-#include "bacnet/bacenum.h"
+/* BACnet Stack API */
 #include "bacnet/bactext.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/basic/sys/mstimer.h"

src/bacnet/basic/client/bac-discover.h

@@ -10,11 +10,11 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacapp.h"
 #include "bacnet/rp.h"
-#include "bacnet/bacnet_stack_exports.h"
 
 /**
  * @brief Callback function for iterating the results of the device discovery.

src/bacnet/basic/client/bac-rw.h

@@ -9,11 +9,11 @@
 #define BAC_RW_H
 
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacapp.h"
 #include "bacnet/rp.h"
-#include "bacnet/bacnet_stack_exports.h"
 
 /**
  * Save the requested ReadProperty data to a data store

src/bacnet/basic/client/bac-task.c

@@ -13,11 +13,12 @@
 #include <string.h>
 #include <math.h>
 /* core library */
-#include "bacnet/apdu.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/apdu.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacerror.h"
-#include "bacnet/config.h"
 #include "bacnet/dcc.h"
 #include "bacnet/iam.h"
 #include "bacnet/npdu.h"

src/bacnet/basic/client/bac-task.h

@@ -10,8 +10,8 @@
 #define BACNET_TASK_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/basic/npdu/h_npdu.c

@@ -24,12 +24,12 @@
  *********************************************************************/
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacaddr.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
+#include "bacnet/bacaddr.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacint.h"
-#include "bacnet/bacenum.h"
-#include "bacnet/bits.h"
 #include "bacnet/npdu.h"
 #include "bacnet/apdu.h"
 #include "bacnet/basic/services.h"

src/bacnet/basic/npdu/h_npdu.h

@@ -32,9 +32,9 @@
 #include <stdint.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"
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/apdu.h"
 #include "bacnet/npdu.h"
 

src/bacnet/basic/npdu/h_routed_npdu.c

@@ -27,11 +27,11 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacint.h"
-#include "bacnet/bacenum.h"
-#include "bacnet/bits.h"
 #include "bacnet/npdu.h"
 #include "bacnet/apdu.h"
 #include "bacnet/bactext.h"

src/bacnet/basic/npdu/h_routed_npdu.h

@@ -32,9 +32,9 @@
 #include <stdint.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"
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/apdu.h"
 
 #ifdef __cplusplus

src/bacnet/basic/npdu/s_router.c

@@ -26,7 +26,6 @@
 #include <stdint.h>
 #include <errno.h>
 #include <string.h>
-#include "bacnet/config.h"
 #include "bacnet/bacdef.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacaddr.h"

src/bacnet/basic/npdu/s_router.h

@@ -32,10 +32,10 @@
 #include <stdint.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/bacapp.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/apdu.h"
 
 #ifdef __cplusplus

src/bacnet/basic/object/acc.c

@@ -1,35 +1,19 @@
-/**************************************************************************
+/**
+ * @file
+ * @brief BACnet accumulator Objects used to represent meter registers
+ * @author Steve Karg
+ * @date 2017
+ * @copyright 2017 Steve Karg <skarg@users.sourceforge.net>
  *
- * Copyright (C) 2017 Steve Karg <skarg@users.sourceforge.net>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *********************************************************************/
-/* BACnet accumulator Objects used to represent meter registers */
-
+ * SPDX-License-Identifier: MIT
+ */
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/config.h"
 #include "bacnet/basic/object/acc.h"
 
 #ifndef MAX_ACCUMULATORS

src/bacnet/basic/object/acc.h

@@ -1,10 +1,20 @@
-#ifndef ACC_H
-#define ACC_H
+/**
+ * @file
+ * @brief Accumulator object header file
+ * @author Steve Karg
+ * @date 2017
+ * @copyright 2017 Steve Karg <skarg@users.sourceforge.net>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef BACNET_BASIC_OBJECT_ACCUMULATOR_H
+#define BACNET_BASIC_OBJECT_ACCUMULATOR_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/bacint.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/access_credential.c

@@ -29,11 +29,11 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
 #include "bacnet/basic/object/access_credential.h"
 #include "bacnet/basic/services.h"

src/bacnet/basic/object/access_credential.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/datetime.h"
 #include "bacnet/timestamp.h"

src/bacnet/basic/object/access_door.c

@@ -28,11 +28,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
 #include "access_door.h"
 #include "bacnet/basic/services.h"

src/bacnet/basic/object/access_door.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/access_point.c

@@ -28,11 +28,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
 #include "access_point.h"
 #include "bacnet/basic/services.h"

src/bacnet/basic/object/access_point.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/timestamp.h"
 #include "bacnet/bacdevobjpropref.h"

src/bacnet/basic/object/access_rights.c

@@ -28,14 +28,15 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
-#include "access_rights.h"
 #include "bacnet/basic/services.h"
+/* me! */
+#include "access_rights.h"
 
 static bool Access_Rights_Initialized = false;
 

src/bacnet/basic/object/access_rights.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/bacdevobjpropref.h"
 #include "bacnet/access_rule.h"

src/bacnet/basic/object/access_user.c

@@ -28,11 +28,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
 #include "access_user.h"
 #include "bacnet/basic/services.h"

src/bacnet/basic/object/access_user.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/bacdevobjpropref.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/access_zone.c

@@ -28,14 +28,15 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
-#include "access_zone.h"
 #include "bacnet/basic/services.h"
+/* me! */
+#include "access_zone.h"
 
 static bool Access_Zone_Initialized = false;
 

src/bacnet/basic/object/access_zone.h

@@ -27,14 +27,14 @@
 
 #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/bacerror.h"
 #include "bacnet/bacdevobjpropref.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
 
-
 #ifndef MAX_ACCESS_ZONES
 #define MAX_ACCESS_ZONES 4
 #endif

src/bacnet/basic/object/ai.c

@@ -29,12 +29,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bactext.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/basic/object/device.h"
 #include "bacnet/basic/services.h"
 #include "bacnet/proplist.h"

src/bacnet/basic/object/ai.h

@@ -28,8 +28,9 @@
 
 #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/rp.h"
 #include "bacnet/wp.h"
 #if defined(INTRINSIC_REPORTING)

src/bacnet/basic/object/ao.c

@@ -36,10 +36,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bactext.h"

src/bacnet/basic/object/ao.h

@@ -37,9 +37,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/config.h"
-#include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/av.c

@@ -30,13 +30,12 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bactext.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/basic/object/device.h"
 #include "bacnet/basic/services.h"
 #include "bacnet/basic/object/av.h"

src/bacnet/basic/object/av.h

@@ -28,8 +28,9 @@
 
 #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/bacerror.h"
 #include "bacnet/wp.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/bacfile.c

@@ -27,23 +27,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "bacnet/config.h"
-#include "bacnet/basic/binding/address.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacapp.h"
-#include "bacnet/datalink/datalink.h"
 #include "bacnet/bacdcode.h"
 #include "bacnet/datetime.h"
 #include "bacnet/npdu.h"
 #include "bacnet/apdu.h"
-#include "bacnet/basic/tsm/tsm.h"
 #include "bacnet/arf.h"
 #include "bacnet/awf.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
-#include "bacnet/basic/services.h"
+#include "bacnet/datalink/datalink.h"
+#include "bacnet/basic/binding/address.h"
 #include "bacnet/basic/object/bacfile.h"
+#include "bacnet/basic/services.h"
 #include "bacnet/basic/sys/keylist.h"
+#include "bacnet/basic/tsm/tsm.h"
 
 #ifndef FILE_RECORD_SIZE
 #define FILE_RECORD_SIZE MAX_OCTET_STRING_BYTES

src/bacnet/basic/object/bacfile.h

@@ -36,9 +36,9 @@
 
 #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"
+/* BACnet Stack API */
 #include "bacnet/bacint.h"
 #include "bacnet/datetime.h"
 #include "bacnet/apdu.h"

src/bacnet/basic/object/bi.c

@@ -28,14 +28,14 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
 #include "bacnet/cov.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/basic/object/bi.h"
 #include "bacnet/basic/services.h"
 

src/bacnet/basic/object/bi.h

@@ -27,8 +27,9 @@
 
 #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/cov.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/blo.c

@@ -11,11 +11,11 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
 #include "bacnet/lighting.h"

src/bacnet/basic/object/blo.h

@@ -11,8 +11,9 @@
 
 #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/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/bo.c

@@ -35,10 +35,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bactext.h"

src/bacnet/basic/object/bo.h

@@ -35,10 +35,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/bacdef.h"  /* Must be before all other bacnet *.h files */
-#include "bacnet/config.h"
-#include "bacnet/bacnet_stack_exports.h"
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacerror.h"
 #include "bacnet/cov.h"
 #include "bacnet/rp.h"

src/bacnet/basic/object/bv.c

@@ -30,9 +30,7 @@
 #include <stdio.h>
 #include "bacnet/bacdef.h"
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
 #include "bacnet/rp.h"
 #include "bacnet/basic/object/bv.h"

src/bacnet/basic/object/bv.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/calendar.c

@@ -20,12 +20,12 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/abort.h"
 #include "bacnet/apdu.h"
-#include "bacnet/bacdef.h"
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bactext.h"

src/bacnet/basic/object/calendar.h

@@ -12,11 +12,10 @@
 
 #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/config.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/calendar_entry.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/channel.c

@@ -36,11 +36,11 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
 #include "bacnet/basic/services.h"
 #include "bacnet/proplist.h"

src/bacnet/basic/object/channel.h

@@ -36,8 +36,9 @@
 
 #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/rp.h"
 #include "bacnet/wp.h"
 #include "bacnet/basic/object/lo.h"

src/bacnet/basic/object/client/device-client.c

@@ -30,26 +30,25 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h> /* for memmove */
-/* OS specific include*/
-#include "bacnet/basic/sys/mstimer.h"
-/* BACnet includes */
+#include <string.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/datetime.h"
 #include "bacnet/apdu.h"
+#include "bacnet/proplist.h"
 #include "bacnet/rp.h" /* ReadProperty handling */
 #include "bacnet/version.h"
 #include "bacnet/basic/services.h"
 #include "bacnet/datalink/datalink.h"
 #include "bacnet/basic/binding/address.h"
-#include "bacnet/proplist.h"
 #if (BACNET_PROTOCOL_REVISION >= 17)
 #include "bacnet/basic/object/netport.h"
 #endif
+/* OS specific include*/
+#include "bacnet/basic/sys/mstimer.h"
 /* include the device object */
 #include "bacnet/basic/object/device.h" /* me */
 

src/bacnet/basic/object/color_object.c

@@ -21,10 +21,10 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bactext.h"

src/bacnet/basic/object/color_object.h

@@ -20,10 +20,9 @@
 
 #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/config.h"
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/color_temperature.c

@@ -21,10 +21,10 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "bacnet/config.h"
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacerror.h"
 #include "bacnet/bacapp.h"
 #include "bacnet/bactext.h"

src/bacnet/basic/object/color_temperature.h

@@ -20,10 +20,9 @@
 
 #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/config.h"
-#include "bacnet/bacenum.h"
+/* BACnet Stack defines - first */
+#include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/command.c

@@ -43,16 +43,17 @@
 #include <stdint.h>
 #include <stdio.h>
 
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bactext.h"
-#include "bacnet/config.h" /* the custom stuff */
-#include "bacnet/basic/object/device.h"
-#include "bacnet/basic/services.h"
 #include "bacnet/lighting.h"
 #include "bacnet/proplist.h"
 #include "bacnet/timestamp.h"
+#include "bacnet/basic/object/device.h"
+#include "bacnet/basic/services.h"
+/* me!*/
 #include "bacnet/basic/object/command.h"
 
 /*BACnetActionCommand ::= SEQUENCE {

src/bacnet/basic/object/command.h

@@ -44,8 +44,9 @@
 
 #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/rp.h"
 #include "bacnet/wp.h"
 

src/bacnet/basic/object/credential_data_input.c

@@ -29,14 +29,15 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/wp.h"
-#include "bacnet/basic/object/credential_data_input.h"
 #include "bacnet/basic/services.h"
+/* me! */
+#include "bacnet/basic/object/credential_data_input.h"
 
 static bool Credential_Data_Input_Initialized = false;
 

src/bacnet/basic/object/credential_data_input.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/timestamp.h"
 #include "bacnet/bacdevobjpropref.h"

src/bacnet/basic/object/csv.c

@@ -29,11 +29,11 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
 #include "bacnet/basic/object/csv.h"

src/bacnet/basic/object/csv.h

@@ -27,8 +27,9 @@
 
 #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/bacerror.h"
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"

src/bacnet/basic/object/device.c

@@ -28,12 +28,12 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h> /* for memmove */
+#include <string.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/datetime.h"
 #include "bacnet/apdu.h"
 #include "bacnet/wp.h" /* WriteProperty handling */

src/bacnet/basic/object/device.h

@@ -31,9 +31,9 @@
 
 #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"
+/* BACnet Stack API */
 #include "bacnet/create_object.h"
 #include "bacnet/delete_object.h"
 #include "bacnet/list_element.h"

src/bacnet/basic/object/gateway/gw_device.c

@@ -28,23 +28,23 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h> /* for memmove */
+#include <string.h>
+/* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+/* BACnet Stack API */
 #include "bacnet/bacdcode.h"
-#include "bacnet/bacenum.h"
 #include "bacnet/bacapp.h"
-#include "bacnet/config.h" /* the custom stuff */
 #include "bacnet/datetime.h"
 #include "bacnet/apdu.h"
 #include "bacnet/wp.h" /* write property handling */
 #include "bacnet/rp.h" /* read property handling */
+#include "bacnet/reject.h"
 #include "bacnet/version.h"
-#include "bacnet/basic/object/device.h" /* me */
 #include "bacnet/basic/services.h"
 #include "bacnet/datalink/datalink.h"
 #include "bacnet/basic/binding/address.h"
-#include "bacnet/reject.h"
 /* include the objects */
+#include "bacnet/basic/object/device.h" /* me */
 #include "bacnet/basic/object/ai.h"
 #include "bacnet/basic/object/ao.h"
 #include "bacnet/basic/object/av.h"