diff --git a/bacnet-stack/include/datalink.h b/bacnet-stack/include/datalink.h
index c2468502..25339450 100644
--- a/bacnet-stack/include/datalink.h
+++ b/bacnet-stack/include/datalink.h
@@ -139,7 +139,9 @@ extern "C" {
  *                     chosen at runtime from among these choices.
  * - Clause 10 POINT-TO-POINT (PTP) and Clause 11 EIA/CEA-709.1 ("LonTalk") LAN
  *   are not currently supported by this project.
-          *//** @defgroup DLTemplates DataLink Template Functions
+ */
+
+/** @defgroup DLTemplates DataLink Template Functions
  * @ingroup DataLink
  * Most of the functions in this group are function templates which are assigned
  * to a specific DataLink network layer implementation either at compile time or
diff --git a/bacnet-stack/include/dcc.h b/bacnet-stack/include/dcc.h
index 252027ee..af453a8c 100644
--- a/bacnet-stack/include/dcc.h
+++ b/bacnet-stack/include/dcc.h
@@ -101,7 +101,9 @@ extern "C" {
  * These device management BIBBs prescribe the BACnet capabilities required 
  * to interoperably perform the device management functions enumerated in 
  * 22.2.1.5 for the BACnet devices defined therein. 
-          *//** @defgroup DMDCC Device Management-Device Communication Control (DM-DCC)
+ */
+
+/** @defgroup DMDCC Device Management-Device Communication Control (DM-DCC)
  * @ingroup RDMS
  * 16.1 DeviceCommunicationControl Service <br>
  * The DeviceCommunicationControl service is used by a client BACnet-user to 
diff --git a/bacnet-stack/include/device.h b/bacnet-stack/include/device.h
index 829730ab..a9da66de 100644
--- a/bacnet-stack/include/device.h
+++ b/bacnet-stack/include/device.h
@@ -237,11 +237,15 @@ extern "C" {
  *  - The interface between the implemented Objects and the BAC-stack services,
  *    specifically the handlers, which are mediated through function calls to
  *    the Device object.
-          *//** @defgroup ObjHelpers Object Helper Functions
+ */
+
+/** @defgroup ObjHelpers Object Helper Functions
  * @ingroup ObjFrmwk
  * This section describes the function templates for the helper functions that
  * provide common object support.
-          *//** @defgroup ObjIntf Handler-to-Object Interface Functions
+ */
+
+/** @defgroup ObjIntf Handler-to-Object Interface Functions
  * @ingroup ObjFrmwk
  * This section describes the fairly limited set of functions that link the
  * BAC-stack handlers to the BACnet Object instances.  All of these calls are
diff --git a/bacnet-stack/include/event.h b/bacnet-stack/include/event.h
index fa93d75f..c6fcab28 100644
--- a/bacnet-stack/include/event.h
+++ b/bacnet-stack/include/event.h
@@ -213,7 +213,9 @@ extern "C" {
  * These BIBBs prescribe the BACnet capabilities required to interoperably 
  * perform the alarm and event management functions enumerated in 22.2.1.2 
  * for the BACnet devices defined therein.
-          *//** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N)
+ */
+
+/** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N)
  * @ingroup ALMEVNT
  * 13.6 ConfirmedCOVNotification Service <br>
  * The ConfirmedCOVNotification service is used to notify subscribers about 
@@ -230,7 +232,9 @@ extern "C" {
  * For unsubscribed notifications, the algorithm for determining when to issue 
  * this service is a local matter and may be based on a change of value, 
  * periodic updating, or some other criteria.
-          *//** @defgroup ALMACK  Alarm and Event-ACK (AE-ACK)
+ */
+
+/** @defgroup ALMACK  Alarm and Event-ACK (AE-ACK)
  * @ingroup ALMEVNT
  * 13.5 AcknowledgeAlarm Service <br>
  * In some systems a device may need to know that an operator has seen the alarm 
diff --git a/bacnet-stack/include/rp.h b/bacnet-stack/include/rp.h
index dc8cf5f4..4a152c9a 100644
--- a/bacnet-stack/include/rp.h
+++ b/bacnet-stack/include/rp.h
@@ -135,7 +135,9 @@ extern "C" {
  * These BIBBs prescribe the BACnet capabilities required to interoperably 
  * perform the data sharing functions enumerated in 22.2.1.1 for the BACnet 
  * devices defined therein.
-          *//** @defgroup DSRP Data Sharing -Read Property Service (DS-RP)
+ */
+
+/** @defgroup DSRP Data Sharing -Read Property Service (DS-RP)
  * @ingroup DataShare
  * 15.5 ReadProperty Service <br>
  * The ReadProperty service is used by a client BACnet-user to request the