diff --git a/bacnet-stack/demo/handler/dlenv.c b/bacnet-stack/demo/handler/dlenv.c
index 795b4322..f4c5bb2f 100644
--- a/bacnet-stack/demo/handler/dlenv.c
+++ b/bacnet-stack/demo/handler/dlenv.c
@@ -35,6 +35,8 @@
 #include "handlers.h"
 #include "client.h"
 
+/** @file dlenv.c  Initialize the DataLink configuration. */
+
 void dlenv_init(
     void)
 {
diff --git a/bacnet-stack/demo/handler/h_alarm_ack.c b/bacnet-stack/demo/handler/h_alarm_ack.c
index 8c11e1f4..51d2c7d0 100644
--- a/bacnet-stack/demo/handler/h_alarm_ack.c
+++ b/bacnet-stack/demo/handler/h_alarm_ack.c
@@ -37,6 +37,8 @@
 #include "alarm_ack.h"
 #include "handlers.h"
 
+/** @file h_alarm_ack.c  Handles Alarm Acknowledgment. */
+
 void handler_alarm_ack(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/h_arf.c b/bacnet-stack/demo/handler/h_arf.c
index 04f39cdb..df98515f 100644
--- a/bacnet-stack/demo/handler/h_arf.c
+++ b/bacnet-stack/demo/handler/h_arf.c
@@ -43,6 +43,8 @@
 #include "bacfile.h"
 #endif
 
+/** @file h_arf.c  Handles Atomic Read File request. */
+
 /*
 from BACnet SSPC-135-2004
 
diff --git a/bacnet-stack/demo/handler/h_arf_a.c b/bacnet-stack/demo/handler/h_arf_a.c
index 89c1d7ef..554f3bdd 100644
--- a/bacnet-stack/demo/handler/h_arf_a.c
+++ b/bacnet-stack/demo/handler/h_arf_a.c
@@ -41,6 +41,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file h_arf_a.c  Handles Acknowledgment of Atomic Read  File response. */
+
 /* We performed an AtomicReadFile Request, */
 /* and here is the data from the server */
 /* Note: it does not have to be the same file=instance */
diff --git a/bacnet-stack/demo/handler/h_awf.c b/bacnet-stack/demo/handler/h_awf.c
index 10b59754..e38f4919 100644
--- a/bacnet-stack/demo/handler/h_awf.c
+++ b/bacnet-stack/demo/handler/h_awf.c
@@ -43,6 +43,8 @@
 #include "bacfile.h"
 #endif
 
+/** @file h_awf.c  Handles Atomic Write File request. */
+
 /*
 from BACnet SSPC-135-2004
 
diff --git a/bacnet-stack/demo/handler/h_cov.c b/bacnet-stack/demo/handler/h_cov.c
index 4d3d20c7..1167a09a 100644
--- a/bacnet-stack/demo/handler/h_cov.c
+++ b/bacnet-stack/demo/handler/h_cov.c
@@ -52,6 +52,8 @@
 #include "bacfile.h"
 #endif
 
+/** @file h_cov.c  Handles Change of Value (COV) services. */
+
 /* note: This COV service only monitors the properties
    of an object that have been specified in the standard.  */
 typedef struct BACnet_COV_Subscription {
diff --git a/bacnet-stack/demo/handler/h_dcc.c b/bacnet-stack/demo/handler/h_dcc.c
index 8d683cdd..e10a29fa 100644
--- a/bacnet-stack/demo/handler/h_dcc.c
+++ b/bacnet-stack/demo/handler/h_dcc.c
@@ -38,6 +38,8 @@
 #include "reject.h"
 #include "dcc.h"
 
+/** @file h_dcc.c  Handles Device Communication Control request. */
+
 static char My_Password[32] = "filister";
 
 void handler_dcc_password_set(
diff --git a/bacnet-stack/demo/handler/h_getevent.c b/bacnet-stack/demo/handler/h_getevent.c
index d8182c2f..52331ad1 100644
--- a/bacnet-stack/demo/handler/h_getevent.c
+++ b/bacnet-stack/demo/handler/h_getevent.c
@@ -38,6 +38,8 @@
 #include "event.h"
 #include "getevent.h"
 
+/** @file h_getevent.c  Handles Get Event Information request. */
+
 static get_event_info_function Get_Event_Info[MAX_BACNET_OBJECT_TYPE];
 
 void handler_get_event_information_set(
diff --git a/bacnet-stack/demo/handler/h_iam.c b/bacnet-stack/demo/handler/h_iam.c
index 1e064e03..cbab378b 100644
--- a/bacnet-stack/demo/handler/h_iam.c
+++ b/bacnet-stack/demo/handler/h_iam.c
@@ -32,6 +32,8 @@
 #include "iam.h"
 #include "address.h"
 
+/** @file h_iam.c  Handles I-Am requests. */
+
 void handler_i_am_add(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/h_ihave.c b/bacnet-stack/demo/handler/h_ihave.c
index a4db6eee..b11638dd 100644
--- a/bacnet-stack/demo/handler/h_ihave.c
+++ b/bacnet-stack/demo/handler/h_ihave.c
@@ -32,6 +32,8 @@
 #include "bactext.h"
 #include "ihave.h"
 
+/** @file h_ihave.c  Handles incoming I-Have messages. */
+
 void handler_i_have(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/h_lso.c b/bacnet-stack/demo/handler/h_lso.c
index 361934d8..1b404eec 100644
--- a/bacnet-stack/demo/handler/h_lso.c
+++ b/bacnet-stack/demo/handler/h_lso.c
@@ -37,6 +37,8 @@
 #include "lso.h"
 #include "handlers.h"
 
+/** @file h_lso.c  Handles BACnet Life Safey Operation messages. */
+
 void handler_lso(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/h_npdu.c b/bacnet-stack/demo/handler/h_npdu.c
index 3cee2571..8ba6751d 100644
--- a/bacnet-stack/demo/handler/h_npdu.c
+++ b/bacnet-stack/demo/handler/h_npdu.c
@@ -36,6 +36,8 @@
 #include <stdio.h>
 #endif
 
+/** @file h_npdu.c  Handles messages at the NPDU level of the BACnet stack. */
+
 void npdu_handler(
     BACNET_ADDRESS * src,       /* source address */
     uint8_t * pdu,      /* PDU data */
diff --git a/bacnet-stack/demo/handler/h_pt.c b/bacnet-stack/demo/handler/h_pt.c
index 27508cbc..b42076aa 100644
--- a/bacnet-stack/demo/handler/h_pt.c
+++ b/bacnet-stack/demo/handler/h_pt.c
@@ -45,6 +45,8 @@
 #include "mydata.h"
 #include "ptransfer.h"
 
+/** @file h_pt.c  Handles Confirmed Private Transfer requests. */
+
 #define MYMAXSTR 32
 #define MYMAXBLOCK 8
 
diff --git a/bacnet-stack/demo/handler/h_pt_a.c b/bacnet-stack/demo/handler/h_pt_a.c
index d44cfc21..70483105 100644
--- a/bacnet-stack/demo/handler/h_pt_a.c
+++ b/bacnet-stack/demo/handler/h_pt_a.c
@@ -45,6 +45,8 @@
 #include "bacfile.h"
 #endif
 
+/** @file h_pt_a.c  Handles Confirmed Private Transfer Acknowledgment. */
+
 extern uint8_t IOBufferPT[300]; /* Somewhere to build the encoded result block for Private Transfers */
 
 
diff --git a/bacnet-stack/demo/handler/h_rd.c b/bacnet-stack/demo/handler/h_rd.c
index 0d4ddfb4..f83c0f1f 100644
--- a/bacnet-stack/demo/handler/h_rd.c
+++ b/bacnet-stack/demo/handler/h_rd.c
@@ -38,6 +38,8 @@
 #include "reject.h"
 #include "rd.h"
 
+/** @file h_rd.c  Handles Reinitialize Device requests. */
+
 static reinitialize_device_function Reinitialize_Device_Function;
 void handler_reinitialize_device_function_set(
     reinitialize_device_function pFunction)
diff --git a/bacnet-stack/demo/handler/h_rp.c b/bacnet-stack/demo/handler/h_rp.c
index 9de0b929..097a64ee 100644
--- a/bacnet-stack/demo/handler/h_rp.c
+++ b/bacnet-stack/demo/handler/h_rp.c
@@ -38,6 +38,8 @@
 #include "abort.h"
 #include "rp.h"
 
+/** @file h_rp.c  Handles Read Property requests. */
+
 /* function that handles the reading of properties from objects */
 static read_property_function Read_Property_Function;
 
diff --git a/bacnet-stack/demo/handler/h_rp_a.c b/bacnet-stack/demo/handler/h_rp_a.c
index 15fc4dd8..d2dd0164 100644
--- a/bacnet-stack/demo/handler/h_rp_a.c
+++ b/bacnet-stack/demo/handler/h_rp_a.c
@@ -41,6 +41,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file h_rp_a.c  Handles Read Property Acknowledgments. */
+
 /* for debugging... */
 static void PrintReadPropertyData(
     BACNET_READ_PROPERTY_DATA * data)
diff --git a/bacnet-stack/demo/handler/h_rpm.c b/bacnet-stack/demo/handler/h_rpm.c
index 63899403..f0887007 100644
--- a/bacnet-stack/demo/handler/h_rpm.c
+++ b/bacnet-stack/demo/handler/h_rpm.c
@@ -39,6 +39,8 @@
 #include "rpm.h"
 #include "handlers.h"
 
+/** @file h_rpm.c  Handles Read Property Multiple requests. */
+
 /* function that handles the reading of properties from objects */
 static read_property_function Read_Property_Function;
 static rpm_object_property_lists_function RPM_Property_List;
diff --git a/bacnet-stack/demo/handler/h_rpm_a.c b/bacnet-stack/demo/handler/h_rpm_a.c
index 613f20d8..1d9753a0 100644
--- a/bacnet-stack/demo/handler/h_rpm_a.c
+++ b/bacnet-stack/demo/handler/h_rpm_a.c
@@ -42,6 +42,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file h_rpm_a.c  Handles Read Property Multiple Acknowledgments. */
+
 /* returns the number of bytes decoded, or -1 on error */
 /* note: initial the linked list of read_access_data */
 static int rpm_ack_decode_service_request(
diff --git a/bacnet-stack/demo/handler/h_rr.c b/bacnet-stack/demo/handler/h_rr.c
index 95f7ad2c..b1e6745a 100644
--- a/bacnet-stack/demo/handler/h_rr.c
+++ b/bacnet-stack/demo/handler/h_rr.c
@@ -37,6 +37,8 @@
 #include "abort.h"
 #include "readrange.h"
 
+/** @file h_rr.c  Handles Read Range requests. */
+
 static uint8_t Temp_Buf[MAX_APDU] = { 0 };
 
 static rr_info_function get_rr_info[MAX_BACNET_OBJECT_TYPE];
diff --git a/bacnet-stack/demo/handler/h_rr_a.c b/bacnet-stack/demo/handler/h_rr_a.c
index fe97019c..10208703 100644
--- a/bacnet-stack/demo/handler/h_rr_a.c
+++ b/bacnet-stack/demo/handler/h_rr_a.c
@@ -41,6 +41,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file h_rr_a.c  Handles Read Range Acknowledgments. */
+
 /* for debugging... */
 static void PrintReadRangeData(
     BACNET_READ_RANGE_DATA * data)
diff --git a/bacnet-stack/demo/handler/h_ts.c b/bacnet-stack/demo/handler/h_ts.c
index 884afbcd..b728f0f2 100644
--- a/bacnet-stack/demo/handler/h_ts.c
+++ b/bacnet-stack/demo/handler/h_ts.c
@@ -31,6 +31,8 @@
 #include "bacdcode.h"
 #include "timesync.h"
 
+/** @file h_ts.c  Handles TimeSync requests. */
+
 #if PRINT_ENABLED
 static void show_bacnet_date_time(
     BACNET_DATE * bdate,
diff --git a/bacnet-stack/demo/handler/h_ucov.c b/bacnet-stack/demo/handler/h_ucov.c
index 95b23438..94f1f1cc 100644
--- a/bacnet-stack/demo/handler/h_ucov.c
+++ b/bacnet-stack/demo/handler/h_ucov.c
@@ -42,6 +42,8 @@
 #define MAX_COV_PROPERTIES 2
 #endif
 
+/** @file h_ucov.c  Handles Unconfirmed COV Notifications. */
+
 /* note: nothing is specified in BACnet about what to do with the
   information received from Unconfirmed COV Notifications. */
 void handler_ucov_notification(
diff --git a/bacnet-stack/demo/handler/h_upt.c b/bacnet-stack/demo/handler/h_upt.c
index d7e76d4d..0f84c434 100644
--- a/bacnet-stack/demo/handler/h_upt.c
+++ b/bacnet-stack/demo/handler/h_upt.c
@@ -36,6 +36,8 @@
 #include "abort.h"
 #include "ptransfer.h"
 
+/** @file h_upt.c  Handles Unconfirmed Private Transfer requests. */
+
 void handler_unconfirmed_private_transfer(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/h_whohas.c b/bacnet-stack/demo/handler/h_whohas.c
index a36d5166..6b012ab1 100644
--- a/bacnet-stack/demo/handler/h_whohas.c
+++ b/bacnet-stack/demo/handler/h_whohas.c
@@ -35,6 +35,8 @@
 #include "device.h"
 #include "client.h"
 
+/** @file h_whohas.c  Handles Who-Has requests. */
+
 void handler_who_has(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/h_whois.c b/bacnet-stack/demo/handler/h_whois.c
index eb58b4e9..89a49397 100644
--- a/bacnet-stack/demo/handler/h_whois.c
+++ b/bacnet-stack/demo/handler/h_whois.c
@@ -37,6 +37,8 @@
 #include "client.h"
 #include "txbuf.h"
 
+/** @file h_whois.c  Handles Who-Is requests. */
+
 void handler_who_is(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/h_wp.c b/bacnet-stack/demo/handler/h_wp.c
index 44c41b7b..a9ea8570 100644
--- a/bacnet-stack/demo/handler/h_wp.c
+++ b/bacnet-stack/demo/handler/h_wp.c
@@ -37,6 +37,8 @@
 #include "abort.h"
 #include "wp.h"
 
+/** @file h_wp.c  Handles Write Property requests. */
+
 static write_property_function Write_Property;
 
 void handler_write_property_function_set(
diff --git a/bacnet-stack/demo/handler/noserv.c b/bacnet-stack/demo/handler/noserv.c
index 205a1ce8..bf02c429 100644
--- a/bacnet-stack/demo/handler/noserv.c
+++ b/bacnet-stack/demo/handler/noserv.c
@@ -34,6 +34,8 @@
 #include "npdu.h"
 #include "reject.h"
 
+/** @file noserv.c  Handles an unrecognized/unsupported service. */
+
 void handler_unrecognized_service(
     uint8_t * service_request,
     uint16_t service_len,
diff --git a/bacnet-stack/demo/handler/objects.c b/bacnet-stack/demo/handler/objects.c
index e8a0d052..f1849b4c 100644
--- a/bacnet-stack/demo/handler/objects.c
+++ b/bacnet-stack/demo/handler/objects.c
@@ -39,6 +39,8 @@
 #include "keylist.h"
 #include "objects.h"
 
+/** @file objects.c  Manage Device Objects. */
+
 /* list of devices */
 static OS_Keylist Device_List = NULL;
 
diff --git a/bacnet-stack/demo/handler/s_ack_alarm.c b/bacnet-stack/demo/handler/s_ack_alarm.c
index 40bdf6d3..dbc14756 100644
--- a/bacnet-stack/demo/handler/s_ack_alarm.c
+++ b/bacnet-stack/demo/handler/s_ack_alarm.c
@@ -44,6 +44,8 @@
 #include "txbuf.h"
 #include "alarm_ack.h"
 
+/** @file s_ack_alarm.c  Send an Alarm Acknowledgment. */
+
 /* returns the invoke ID for confirmed request, or zero on failure */
 
 
diff --git a/bacnet-stack/demo/handler/s_arfs.c b/bacnet-stack/demo/handler/s_arfs.c
index a46beba2..7bc6071e 100644
--- a/bacnet-stack/demo/handler/s_arfs.c
+++ b/bacnet-stack/demo/handler/s_arfs.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_arfs.c  Send part of an Atomic Read File Stream. */
+
 uint8_t Send_Atomic_Read_File_Stream(
     uint32_t device_id,
     uint32_t file_instance,
diff --git a/bacnet-stack/demo/handler/s_awfs.c b/bacnet-stack/demo/handler/s_awfs.c
index 522d13ba..05bc5cee 100644
--- a/bacnet-stack/demo/handler/s_awfs.c
+++ b/bacnet-stack/demo/handler/s_awfs.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_awfs.c  Send part of an Atomic Write File Stream request. */
+
 uint8_t Send_Atomic_Write_File_Stream(
     uint32_t device_id,
     uint32_t file_instance,
diff --git a/bacnet-stack/demo/handler/s_cevent.c b/bacnet-stack/demo/handler/s_cevent.c
index 2c6da25d..e82e8364 100644
--- a/bacnet-stack/demo/handler/s_cevent.c
+++ b/bacnet-stack/demo/handler/s_cevent.c
@@ -34,6 +34,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_cevent.c  Send a ConfirmedEventNotification Request. */
+
 /* returns the invoke id, 0=unsuccessful */
 uint8_t Send_CEvent_Notify(
     uint32_t device_id,
diff --git a/bacnet-stack/demo/handler/s_cov.c b/bacnet-stack/demo/handler/s_cov.c
index 6eceac2a..be1cd625 100644
--- a/bacnet-stack/demo/handler/s_cov.c
+++ b/bacnet-stack/demo/handler/s_cov.c
@@ -41,6 +41,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_cov.c  Send a Change of Value (COV) update or a Subscribe COV request. */
+
 int ucov_notify_encode_pdu(
     uint8_t * buffer,
     BACNET_ADDRESS * dest,
diff --git a/bacnet-stack/demo/handler/s_dcc.c b/bacnet-stack/demo/handler/s_dcc.c
index 59738abc..d30ed91f 100644
--- a/bacnet-stack/demo/handler/s_dcc.c
+++ b/bacnet-stack/demo/handler/s_dcc.c
@@ -42,6 +42,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_dcc.c  Send a Device Communication Control (DCC) request. */
+
 uint8_t Send_Device_Communication_Control_Request(
     uint32_t device_id,
     uint16_t timeDuration,      /* 0=optional */
diff --git a/bacnet-stack/demo/handler/s_iam.c b/bacnet-stack/demo/handler/s_iam.c
index 1ff8eda6..31e25451 100644
--- a/bacnet-stack/demo/handler/s_iam.c
+++ b/bacnet-stack/demo/handler/s_iam.c
@@ -40,6 +40,14 @@
 /* some demo stuff needed */
 #include "handlers.h"
 
+/** @file s_iam.c  Send an I-Am message. */
+
+/** Encode an I Am message.
+ * @param buffer [in,out] The buffer to use for building the message.
+ * @param dest [out] The destination address information.
+ * @param npdu_data [out] The NPDU structure describing the message.
+ * @return The length of the message in buffer[].
+ */
 int iam_encode_pdu(
     uint8_t * buffer,
     BACNET_ADDRESS * dest,
@@ -62,6 +70,9 @@ int iam_encode_pdu(
     return pdu_len;
 }
 
+/** Broadcast an I Am message.
+ * @param buffer [in] The buffer to use for building and sending the message.
+ */
 void Send_I_Am(
     uint8_t * buffer)
 {
diff --git a/bacnet-stack/demo/handler/s_ihave.c b/bacnet-stack/demo/handler/s_ihave.c
index d00d6bb7..5147a9bc 100644
--- a/bacnet-stack/demo/handler/s_ihave.c
+++ b/bacnet-stack/demo/handler/s_ihave.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_ihave.c  Send an I-Have (property) message. */
+
 /* find a specific device, or use -1 for limit if you want unlimited */
 void Send_I_Have(
     uint32_t device_id,
diff --git a/bacnet-stack/demo/handler/s_lso.c b/bacnet-stack/demo/handler/s_lso.c
index ba6f4ea6..791a6f68 100644
--- a/bacnet-stack/demo/handler/s_lso.c
+++ b/bacnet-stack/demo/handler/s_lso.c
@@ -44,6 +44,8 @@
 #include "txbuf.h"
 #include "lso.h"
 
+/** @file s_lso.c  Send BACnet Life Safety Operation message. */
+
 /* returns the invoke ID for confirmed request, or zero on failure */
 
 
diff --git a/bacnet-stack/demo/handler/s_ptransfer.c b/bacnet-stack/demo/handler/s_ptransfer.c
index 1b2c935f..9fd2486a 100644
--- a/bacnet-stack/demo/handler/s_ptransfer.c
+++ b/bacnet-stack/demo/handler/s_ptransfer.c
@@ -45,6 +45,7 @@
 #include "txbuf.h"
 #include "mydata.h"
 
+/** @file s_ptransfer.c  Send a Private Transfer request. */
 
 uint8_t Send_Private_Transfer_Request(
     uint32_t device_id,
diff --git a/bacnet-stack/demo/handler/s_rd.c b/bacnet-stack/demo/handler/s_rd.c
index 31915466..b5069e20 100644
--- a/bacnet-stack/demo/handler/s_rd.c
+++ b/bacnet-stack/demo/handler/s_rd.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_rd.c  Send a Reinitialize Device request. */
+
 uint8_t Send_Reinitialize_Device_Request(
     uint32_t device_id,
     BACNET_REINITIALIZED_STATE state,
diff --git a/bacnet-stack/demo/handler/s_readrange.c b/bacnet-stack/demo/handler/s_readrange.c
index b1ef34ca..c8b5946a 100644
--- a/bacnet-stack/demo/handler/s_readrange.c
+++ b/bacnet-stack/demo/handler/s_readrange.c
@@ -44,6 +44,8 @@
 #include "txbuf.h"
 #include "readrange.h"
 
+/** @file s_readrange.c  Send a ReadRange request. */
+
 /* returns invoke id of 0 if device is not bound or no tsm available */
 uint8_t Send_ReadRange_Request(
     uint32_t device_id, /* destination device */
diff --git a/bacnet-stack/demo/handler/s_router.c b/bacnet-stack/demo/handler/s_router.c
index 872f7099..7dd91838 100644
--- a/bacnet-stack/demo/handler/s_router.c
+++ b/bacnet-stack/demo/handler/s_router.c
@@ -41,6 +41,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_router.c  Send BACnet Router requests. */
+
 static void npdu_encode_npdu_network(
     BACNET_NPDU_DATA * npdu_data,
     BACNET_NETWORK_MESSAGE_TYPE network_message_type,
diff --git a/bacnet-stack/demo/handler/s_rp.c b/bacnet-stack/demo/handler/s_rp.c
index a8b30a84..a27508fa 100644
--- a/bacnet-stack/demo/handler/s_rp.c
+++ b/bacnet-stack/demo/handler/s_rp.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_rp.c  Send Read Property request. */
+
 /* returns invoke id of 0 if device is not bound or no tsm available */
 uint8_t Send_Read_Property_Request(
     uint32_t device_id, /* destination device */
diff --git a/bacnet-stack/demo/handler/s_rpm.c b/bacnet-stack/demo/handler/s_rpm.c
index df15ef96..d4b6ab5a 100644
--- a/bacnet-stack/demo/handler/s_rpm.c
+++ b/bacnet-stack/demo/handler/s_rpm.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "sbuf.h"
 
+/** @file s_rpm.c  Send Read Property Multiple request. */
+
 /* returns invoke id of 0 if device is not bound or no tsm available */
 uint8_t Send_Read_Property_Multiple_Request(
     uint8_t * pdu,
diff --git a/bacnet-stack/demo/handler/s_ts.c b/bacnet-stack/demo/handler/s_ts.c
index a15f7726..49b705fe 100644
--- a/bacnet-stack/demo/handler/s_ts.c
+++ b/bacnet-stack/demo/handler/s_ts.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_ts.c  Send TimeSync requests. */
+
 void Send_TimeSync(
     BACNET_DATE * bdate,
     BACNET_TIME * btime)
diff --git a/bacnet-stack/demo/handler/s_uevent.c b/bacnet-stack/demo/handler/s_uevent.c
index 79a134aa..4b372684 100644
--- a/bacnet-stack/demo/handler/s_uevent.c
+++ b/bacnet-stack/demo/handler/s_uevent.c
@@ -28,6 +28,8 @@
 #include "event.h"
 #include "datalink.h"
 
+/** @file s_uevent.c  Send an Unconfirmed Event Notification. */
+
 int Send_UEvent_Notify(
     uint8_t * buffer,
     BACNET_EVENT_NOTIFICATION_DATA * data,
diff --git a/bacnet-stack/demo/handler/s_upt.c b/bacnet-stack/demo/handler/s_upt.c
index 038bf3bf..222a2a81 100644
--- a/bacnet-stack/demo/handler/s_upt.c
+++ b/bacnet-stack/demo/handler/s_upt.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_upt.c  Send an Unconfirmed Private Transfer request. */
+
 void Send_UnconfirmedPrivateTransfer(
     BACNET_ADDRESS * dest,
     BACNET_PRIVATE_TRANSFER_DATA * private_data)
diff --git a/bacnet-stack/demo/handler/s_whohas.c b/bacnet-stack/demo/handler/s_whohas.c
index 1ef7f68d..b095326e 100644
--- a/bacnet-stack/demo/handler/s_whohas.c
+++ b/bacnet-stack/demo/handler/s_whohas.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_whohas.c  Send Who-Has requests. */
+
 /* find a specific device, or use -1 for limit if you want unlimited */
 void Send_WhoHas_Name(
     int32_t low_limit,
diff --git a/bacnet-stack/demo/handler/s_whois.c b/bacnet-stack/demo/handler/s_whois.c
index 29930b6d..e0867bda 100644
--- a/bacnet-stack/demo/handler/s_whois.c
+++ b/bacnet-stack/demo/handler/s_whois.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_whois.c  Send a Who-Is request. */
+
 /* find a specific device, or use -1 for limit if you want unlimited */
 void Send_WhoIs(
     int32_t low_limit,
diff --git a/bacnet-stack/demo/handler/s_wp.c b/bacnet-stack/demo/handler/s_wp.c
index 1e80a023..ee390973 100644
--- a/bacnet-stack/demo/handler/s_wp.c
+++ b/bacnet-stack/demo/handler/s_wp.c
@@ -43,6 +43,8 @@
 #include "handlers.h"
 #include "txbuf.h"
 
+/** @file s_wp.c  Send a Write Property request. */
+
 /* returns the invoke ID for confirmed request, or zero on failure */
 uint8_t Send_Write_Property_Request_Data(
     uint32_t device_id,
diff --git a/bacnet-stack/demo/handler/txbuf.c b/bacnet-stack/demo/handler/txbuf.c
index fe1b27fe..af6f47be 100644
--- a/bacnet-stack/demo/handler/txbuf.c
+++ b/bacnet-stack/demo/handler/txbuf.c
@@ -27,4 +27,6 @@
 #include "config.h"
 #include "datalink.h"
 
+/** @file txbuf.c  Declare the global Transmit Buffer for handler functions. */
+
 uint8_t Handler_Transmit_Buffer[MAX_PDU] = { 0 };
diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile
index 0632216b..af7945fc 100644
--- a/bacnet-stack/demo/server/Makefile
+++ b/bacnet-stack/demo/server/Makefile
@@ -9,7 +9,7 @@ TARGET = bacserv
 #BACDL_DEFINE = -DBACDL_ETHERNET
 #BACDL_DEFINE = -DBACDL_ARCNET
 #BACDL_DEFINE = -DBACDL_MSTP
-BACDL_DEFINE = -DBACDL_BIP -DBIP_DEBUG
+BACDL_DEFINE = -DBACDL_BIP
 BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL -DBACFILE
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
 
@@ -41,6 +41,9 @@ OPTIMIZATION = -Os
 ifeq (${BUILD},debug)
 OPTIMIZATION = -O0
 DEBUGGING = -g
+ifeq (${BACDL_DEFINE},-DBACDL_BIP=1)
+DEFINES += -DBIP_DEBUG
+endif
 endif
 # put all the flags together
 CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES) -fdata-sections -ffunction-sections
diff --git a/bacnet-stack/demo/server/main.c b/bacnet-stack/demo/server/main.c
index 41d6047a..0a774124 100644
--- a/bacnet-stack/demo/server/main.c
+++ b/bacnet-stack/demo/server/main.c
@@ -50,7 +50,7 @@
 /* include the device object */
 #include "device.h"
 
-/* This is an example server application using the BACnet Stack */
+/** @file server/main.c  Example server application using the BACnet Stack */
 
 /* buffers used for receiving */
 static uint8_t Rx_Buf[MAX_MPDU] = { 0 };