diff --git a/bacnet-stack/include/dcc.h b/bacnet-stack/include/dcc.h
index c1af9fe6..0438572b 100644
--- a/bacnet-stack/include/dcc.h
+++ b/bacnet-stack/include/dcc.h
@@ -94,7 +94,9 @@ extern "C" {
  *
  * The network management BIBBs prescribe the BACnet capabilities required to
  * interoperably perform network management functions.
-          *//** @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
@@ -107,7 +109,9 @@ extern "C" {
  * "indefinite," meaning communication must be re-enabled by a
  * DeviceCommunicationControl or, if supported, ReinitializeDevice service,
  * not by time.
-          *//** @defgroup NMRC Network Management-Router Configuration (NM-RC)
+ */
+
+/** @defgroup NMRC Network Management-Router Configuration (NM-RC)
  * @ingroup RDMS
  * The A device may query and change the configuration of routers and
  * half-routers.
diff --git a/bacnet-stack/include/event.h b/bacnet-stack/include/event.h
index b5c2f21b..537e18ac 100644
--- a/bacnet-stack/include/event.h
+++ b/bacnet-stack/include/event.h
@@ -202,7 +202,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
@@ -219,7 +221,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/readrange.h b/bacnet-stack/include/readrange.h
index 672799d7..b051e33e 100644
--- a/bacnet-stack/include/readrange.h
+++ b/bacnet-stack/include/readrange.h
@@ -162,7 +162,9 @@ extern "C" {
  * These BIBBs prescribe the BACnet capabilities required to interoperably
  * perform the trending functions enumerated in clause 22.2.1.4 for the
  * BACnet devices defined therein.
-          *//** @defgroup TrendReadRange Trending -Read Range Service (eg, in T-VMT)
+*/
+
+/** @defgroup TrendReadRange Trending -Read Range Service (eg, in T-VMT)
  * @ingroup Trend
  * 15.8 ReadRange Service <br>
  * The ReadRange service is used by a client BACnet-user to read a specific
diff --git a/bacnet-stack/include/rp.h b/bacnet-stack/include/rp.h
index 8c1e031c..025145f6 100644
--- a/bacnet-stack/include/rp.h
+++ b/bacnet-stack/include/rp.h
@@ -125,7 +125,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
diff --git a/bacnet-stack/src/keylist.c b/bacnet-stack/src/keylist.c
index 2f3ded06..0cff93c3 100644
--- a/bacnet-stack/src/keylist.c
+++ b/bacnet-stack/src/keylist.c
@@ -52,9 +52,9 @@
 #define TRUE 1
 #endif
 
-/*/////////////////////////////////////////////////////////////////// */
+/******************************************************************** */
 /* Generic node routines */
-/*/////////////////////////////////////////////////////////////////// */
+/******************************************************************** */
 
 /* grab memory for a node */
 static struct Keylist_Node *NodeCreate(
@@ -169,9 +169,9 @@ static int FindIndex(
 }
 
 
-/*/////////////////////////////////////////////////////////////////// */
+/******************************************************************** */
 /* list data functions */
-/*/////////////////////////////////////////////////////////////////// */
+/******************************************************************** */
 /* inserts a node into its sorted position */
 int Keylist_Data_Add(
     OS_Keylist list,
@@ -365,9 +365,9 @@ int Keylist_Count(
     return list->count;
 }
 
-/*/////////////////////////////////////////////////////////////////// */
+/******************************************************************** */
 /* Public List functions */
-/*/////////////////////////////////////////////////////////////////// */
+/******************************************************************** */
 
 /* returns head of the list or NULL on failure. */
 OS_Keylist Keylist_Create(