diff --git a/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-files.h b/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-files.h
index 4e7d87b09..d84459b17 100644
--- a/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-files.h
+++ b/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-files.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-portable-posix-files.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-portable-posix-files
  */
 
 #ifndef UT_ADAPTOR_PORTABLE_POSIX_FILES_H
@@ -34,4 +34,4 @@
 OCS_uid_t UT_PortablePosixFileTest_GetSelfEUID(void);
 OCS_gid_t UT_PortablePosixFileTest_GetSelfEGID(void);
 
-#endif /* UT_ADAPTOR_PORTABLE_POSIX_FILES_H  */
+#endif /* UT_ADAPTOR_PORTABLE_POSIX_FILES_H */
diff --git a/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-io.h b/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-io.h
index 365cf699b..9557537fa 100644
--- a/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-io.h
+++ b/src/unit-test-coverage/portable/adaptors/inc/ut-adaptor-portable-posix-io.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-portable-posix-io.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-portable-posix-io
  */
 
 #ifndef UT_ADAPTOR_PORTABLE_POSIX_IO_H
@@ -43,4 +43,4 @@ void UT_PortablePosixIOTest_Set_FD(osal_index_t local_id, int fd);
 bool UT_PortablePosixIOTest_Get_Selectable(osal_index_t local_id);
 void UT_PortablePosixIOTest_ResetImpl(osal_index_t local_id);
 
-#endif /* UT_ADAPTOR_PORTABLE_POSIX_IO_H  */
+#endif /* UT_ADAPTOR_PORTABLE_POSIX_IO_H */
diff --git a/src/unit-test-coverage/portable/src/os-portable-coveragetest.h b/src/unit-test-coverage/portable/src/os-portable-coveragetest.h
index eb946dff0..0b55d175d 100644
--- a/src/unit-test-coverage/portable/src/os-portable-coveragetest.h
+++ b/src/unit-test-coverage/portable/src/os-portable-coveragetest.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     os-portable-coveragetest.h
- * \ingroup  portable
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup portable
  *
+ * Declarations and prototypes for os-portable-coveragetest
  */
 
 #ifndef OS_PORTABLE_COVERAGETEST_H
@@ -66,4 +66,4 @@
 void Osapi_Test_Setup(void);
 void Osapi_Test_Teardown(void);
 
-#endif /* OS_PORTABLE_COVERAGETEST_H  */
+#endif /* OS_PORTABLE_COVERAGETEST_H */
diff --git a/src/unit-test-coverage/shared/adaptors/inc/ut-adaptor-module.h b/src/unit-test-coverage/shared/adaptors/inc/ut-adaptor-module.h
index da0ce088b..690ec3901 100644
--- a/src/unit-test-coverage/shared/adaptors/inc/ut-adaptor-module.h
+++ b/src/unit-test-coverage/shared/adaptors/inc/ut-adaptor-module.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-module.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-module
  */
 
 #ifndef UT_ADAPTOR_MODULE_H
@@ -52,4 +52,4 @@ void Test_DummyFunc(void);
 int32 Osapi_Call_SymbolLookup_Static(cpuaddr *SymbolAddress, const char *SymbolName, const char *ModuleName);
 int32 Osapi_Call_ModuleLoad_Static(const char *ModuleName);
 
-#endif /* UT_ADAPTOR_MODULE_H  */
+#endif /* UT_ADAPTOR_MODULE_H */
diff --git a/src/unit-test-coverage/shared/src/os-shared-coveragetest.h b/src/unit-test-coverage/shared/src/os-shared-coveragetest.h
index 21b0a3d7d..a2efd7eab 100644
--- a/src/unit-test-coverage/shared/src/os-shared-coveragetest.h
+++ b/src/unit-test-coverage/shared/src/os-shared-coveragetest.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     os-shared-coveragetest.h
- * \ingroup  shared
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup shared
  *
+ * Declarations and prototypes for os-shared-coveragetest
  */
 
 #ifndef OS_SHARED_COVERAGETEST_H
@@ -113,4 +113,4 @@ void Osapi_Test_Setup(void);
  */
 void Osapi_Test_Teardown(void);
 
-#endif /* OS_SHARED_COVERAGETEST_H  */
+#endif /* OS_SHARED_COVERAGETEST_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_arpa_inet.h b/src/unit-test-coverage/ut-stubs/inc/OCS_arpa_inet.h
index d244aa10f..57964df87 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_arpa_inet.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_arpa_inet.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for arpa/inet.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for arpa/inet.h
+ */
+
 #ifndef OCS_ARPA_INET_H
 #define OCS_ARPA_INET_H
 
@@ -39,4 +45,4 @@
 extern const char *OCS_inet_ntop(int af, const void *cp, char *buf, size_t len);
 extern int         OCS_inet_pton(int af, const char *cp, void *buf);
 
-#endif /*  OCS_ARPA_INET_H */
+#endif /* OCS_ARPA_INET_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_assert.h b/src/unit-test-coverage/ut-stubs/inc/OCS_assert.h
index 841e81efc..e11d2f783 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_assert.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_assert.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for assert.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for assert.h
+ */
+
 #ifndef OCS_ASSERT_H
 #define OCS_ASSERT_H
 
@@ -38,4 +44,4 @@
 
 void OCS_assert(bool expression);
 
-#endif /*  OCS_ASSERT_H */
+#endif /* OCS_ASSERT_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_basetypes.h b/src/unit-test-coverage/ut-stubs/inc/OCS_basetypes.h
index 0d1098e6f..3248bb7e3 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_basetypes.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_basetypes.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub basic data types */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub basic data types
+ */
+
 #ifndef OCS_BASETYPES_H
 #define OCS_BASETYPES_H
 
@@ -36,4 +42,4 @@
 #include <limits.h>  /* for correct INT_MAX, etc. */
 #include <stdbool.h> /* for correct boolean semantics */
 
-#endif /*  OCS_BASETYPES_H */
+#endif /* OCS_BASETYPES_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_blkIo.h b/src/unit-test-coverage/ut-stubs/inc/OCS_blkIo.h
index 5348636f3..2418bfce9 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_blkIo.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_blkIo.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub basic data types */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub basic data types
+ */
+
 #ifndef OCS_BLKIO_H
 #define OCS_BLKIO_H
 
@@ -32,4 +38,4 @@ typedef struct OCS_BLK_DEV
 } OCS_BLK_DEV;
 typedef OCS_BLK_DEV *OCS_BLK_DEV_ID;
 
-#endif /*  OCS_BLKIO_H */
+#endif /* OCS_BLKIO_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h b/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h
index ea24e37d1..d76e3fc75 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h
@@ -19,10 +19,8 @@
  */
 
 /**
- * \file     OCS_bsp-impl.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
- *
+ * \file
+ * \ingroup ut-stubs
  *
  * Purpose: Contains functions prototype definitions and variables declarations
  *          for the OSAL BSP layer
@@ -90,4 +88,4 @@ extern void OCS_OS_BSP_ConsoleOutput_Impl(const char *Str, size_t DataLen);
  ------------------------------------------------------------------*/
 extern void OCS_OS_BSP_ConsoleSetMode_Impl(uint32_t ModeBits);
 
-#endif /* OCS_BSP_IMPL_H  */
+#endif /* OCS_BSP_IMPL_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_cbioLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_cbioLib.h
index 89717782a..e25898c95 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_cbioLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_cbioLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for cbioLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for cbioLib.h
+ */
+
 #ifndef OCS_CBIOLIB_H
 #define OCS_CBIOLIB_H
 
@@ -37,4 +43,4 @@
 /* prototypes normally declared in cbioLib.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_CBIOLIB_H */
+#endif /* OCS_CBIOLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_complex.h b/src/unit-test-coverage/ut-stubs/inc/OCS_complex.h
index c9d81ef55..9c67bc1cc 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_complex.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_complex.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for complex.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for complex.h
+ */
+
 #ifndef OCS_COMPLEX_H
 #define OCS_COMPLEX_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in complex.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_COMPLEX_H */
+#endif /* OCS_COMPLEX_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_ctype.h b/src/unit-test-coverage/ut-stubs/inc/OCS_ctype.h
index b4e091fdf..45eda6f2a 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ctype.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ctype.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ctype.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ctype.h
+ */
+
 #ifndef OCS_CTYPE_H
 #define OCS_CTYPE_H
 
@@ -38,4 +44,4 @@
 
 extern int OCS_isgraph(int c);
 
-#endif /*  OCS_CTYPE_H */
+#endif /* OCS_CTYPE_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_dirent.h b/src/unit-test-coverage/ut-stubs/inc/OCS_dirent.h
index bf88e5c04..a746a8d89 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_dirent.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_dirent.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for dirent.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for dirent.h
+ */
+
 #ifndef OCS_DIRENT_H
 #define OCS_DIRENT_H
 
@@ -48,4 +54,4 @@ extern OCS_DIR *          OCS_opendir(const char *name);
 extern struct OCS_dirent *OCS_readdir(OCS_DIR *dirp);
 extern void               OCS_rewinddir(OCS_DIR *dirp);
 
-#endif /*  OCS_DIRENT_H */
+#endif /* OCS_DIRENT_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_dlfcn.h b/src/unit-test-coverage/ut-stubs/inc/OCS_dlfcn.h
index 1d3fdb3cd..47333d3ef 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_dlfcn.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_dlfcn.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for dlfcn.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for dlfcn.h
+ */
+
 #ifndef OCS_DLFCN_H
 #define OCS_DLFCN_H
 
@@ -41,4 +47,4 @@ extern char *OCS_dlerror(void);
 extern void *OCS_dlopen(const char *file, int flags);
 extern void *OCS_dlsym(void *handle, const char *name);
 
-#endif /*  OCS_DLFCN_H */
+#endif /* OCS_DLFCN_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_dosFsLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_dosFsLib.h
index 74447deb5..a5092eb50 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_dosFsLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_dosFsLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for dosFsLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for dosFsLib.h
+ */
+
 #ifndef OCS_DOSFSLIB_H
 #define OCS_DOSFSLIB_H
 
@@ -43,4 +49,4 @@
 /* ----------------------------------------- */
 extern OCS_STATUS OCS_dosFsVolFormat(char *path, int opt, OCS_FUNCPTR pPromptFunc);
 
-#endif /*  OCS_DOSFSLIB_H */
+#endif /* OCS_DOSFSLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_drv_hdisk_ataDrv.h b/src/unit-test-coverage/ut-stubs/inc/OCS_drv_hdisk_ataDrv.h
index c7735acb9..bf3ee3717 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_drv_hdisk_ataDrv.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_drv_hdisk_ataDrv.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for drv/hdisk/ataDrv.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for drv/hdisk/ataDrv.h
+ */
+
 #ifndef OCS_DRV_HDISK_ATADRV_H
 #define OCS_DRV_HDISK_ATADRV_H
 
@@ -39,4 +45,4 @@
 /* ----------------------------------------- */
 extern OCS_BLK_DEV *OCS_ataDevCreate(int ctrl, int drive, unsigned int nBlocks, unsigned int blkOffset);
 
-#endif /*  OCS_DRV_HDISK_ATADRV_H */
+#endif /* OCS_DRV_HDISK_ATADRV_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_errno.h b/src/unit-test-coverage/ut-stubs/inc/OCS_errno.h
index e13aa3083..bd8f1fade 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_errno.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_errno.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for errno.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for errno.h
+ */
+
 #ifndef OCS_ERRNO_H
 #define OCS_ERRNO_H
 
@@ -49,4 +55,4 @@
 
 extern int OCS_errno;
 
-#endif /*  OCS_ERRNO_H */
+#endif /* OCS_ERRNO_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_errnoLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_errnoLib.h
index 738bc81e3..f8f04234d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_errnoLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_errnoLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for errnoLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for errnoLib.h
+ */
+
 #ifndef OCS_ERRNOLIB_H
 #define OCS_ERRNOLIB_H
 
@@ -39,4 +45,4 @@
 
 extern int OCS_errnoGet(void);
 
-#endif /*  OCS_ERRNOLIB_H */
+#endif /* OCS_ERRNOLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_fcntl.h b/src/unit-test-coverage/ut-stubs/inc/OCS_fcntl.h
index 1c9e9b398..1bf974d9c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_fcntl.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_fcntl.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for fcntl.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for fcntl.h
+ */
+
 #ifndef OCS_FCNTL_H
 #define OCS_FCNTL_H
 
@@ -81,4 +87,4 @@
 extern int OCS_fcntl(int fd, int cmd, ...);
 extern int OCS_open(const char *file, int oflag, ...);
 
-#endif /*  OCS_FCNTL_H */
+#endif /* OCS_FCNTL_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_fenv.h b/src/unit-test-coverage/ut-stubs/inc/OCS_fenv.h
index db2e4d2b7..9d35a5dce 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_fenv.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_fenv.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for fenv.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for fenv.h
+ */
+
 #ifndef OCS_FENV_H
 #define OCS_FENV_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in fenv.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_FENV_H */
+#endif /* OCS_FENV_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_float.h b/src/unit-test-coverage/ut-stubs/inc/OCS_float.h
index 42fe246c7..c515c25c1 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_float.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_float.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for float.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for float.h
+ */
+
 #ifndef OCS_FLOAT_H
 #define OCS_FLOAT_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in float.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_FLOAT_H */
+#endif /* OCS_FLOAT_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_hostLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_hostLib.h
index 91c6468c9..7049a8b5c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_hostLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_hostLib.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     OCS_hostLib.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
+ * Declarations and prototypes for OCS_hostLib
  */
 
 #ifndef OCS_HOSTLIB_H
@@ -44,4 +44,4 @@
 /* ----------------------------------------- */
 extern int OCS_hostGetByName(char *name);
 
-#endif /* OCS_HOSTLIB_H  */
+#endif /* OCS_HOSTLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_intLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_intLib.h
index adf610020..a5642543d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_intLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_intLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for intLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for intLib.h
+ */
+
 #ifndef OCS_INTLIB_H
 #define OCS_INTLIB_H
 
@@ -44,4 +50,4 @@ extern int              OCS_intLock(void);
 extern int              OCS_intUnlock(int lockKey);
 extern OCS_VOIDFUNCPTR *OCS_INUM_TO_IVEC(unsigned int ui);
 
-#endif /*  OCS_INTLIB_H */
+#endif /* OCS_INTLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_inttypes.h b/src/unit-test-coverage/ut-stubs/inc/OCS_inttypes.h
index f463e35bd..4fe3ae1f6 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_inttypes.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_inttypes.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for inttypes.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for inttypes.h
+ */
+
 #ifndef OCS_INTTYPES_H
 #define OCS_INTTYPES_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in inttypes.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_INTTYPES_H */
+#endif /* OCS_INTTYPES_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_ioLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_ioLib.h
index 4b586b558..f864eb8a4 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ioLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ioLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ioLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ioLib.h
+ */
+
 #ifndef OCS_IOLIB_H
 #define OCS_IOLIB_H
 
@@ -42,4 +48,4 @@
 
 extern int OCS_ioctl(int fd, unsigned long request, ...);
 
-#endif /*  OCS_IOLIB_H */
+#endif /* OCS_IOLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_iv.h b/src/unit-test-coverage/ut-stubs/inc/OCS_iv.h
index 686331dc2..fdedd0ec1 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_iv.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_iv.h
@@ -18,10 +18,16 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for iv.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for iv.h
+ */
+
 #ifndef OCS_IV_H
 #define OCS_IV_H
 
 #include "OCS_basetypes.h"
 
-#endif /*  OCS_IV_H */
+#endif /* OCS_IV_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_loadLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_loadLib.h
index 62ed85a88..6777a577b 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_loadLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_loadLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for loadLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for loadLib.h
+ */
+
 #ifndef OCS_LOADLIB_H
 #define OCS_LOADLIB_H
 
@@ -40,4 +46,4 @@
 
 extern OCS_MODULE_ID OCS_loadModule(int fd, unsigned int symFlag);
 
-#endif /*  OCS_LOADLIB_H */
+#endif /* OCS_LOADLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_locale.h b/src/unit-test-coverage/ut-stubs/inc/OCS_locale.h
index 798113d67..c67366830 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_locale.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_locale.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for locale.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for locale.h
+ */
+
 #ifndef OCS_LOCALE_H
 #define OCS_LOCALE_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in locale.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_LOCALE_H */
+#endif /* OCS_LOCALE_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_logLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_logLib.h
index 192d96b9b..567545d35 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_logLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_logLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for logLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for logLib.h
+ */
+
 #ifndef OCS_LOGLIB_H
 #define OCS_LOGLIB_H
 
@@ -37,4 +43,4 @@
 /* prototypes normally declared in logLib.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_LOGLIB_H */
+#endif /* OCS_LOGLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_math.h b/src/unit-test-coverage/ut-stubs/inc/OCS_math.h
index cf75ca7b3..9e986adb9 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_math.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_math.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for math.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for math.h
+ */
+
 #ifndef OCS_MATH_H
 #define OCS_MATH_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in math.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_MATH_H */
+#endif /* OCS_MATH_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_memPartLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_memPartLib.h
index 46c23f726..2c390d41b 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_memPartLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_memPartLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for memPartLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for memPartLib.h
+ */
+
 #ifndef OCS_MEMPARTLIB_H
 #define OCS_MEMPARTLIB_H
 
@@ -54,4 +60,4 @@ extern OCS_STATUS OCS_memPartInfoGet(OCS_PART_ID         partId, /* partition ID
 
 extern OCS_PART_ID OCS_memSysPartId;
 
-#endif /*  OCS_MEMPARTLIB_H */
+#endif /* OCS_MEMPARTLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h
index a2c634a6a..3e6f4097c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for moduleLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for moduleLib.h
+ */
+
 #ifndef OCS_MODULELIB_H
 #define OCS_MODULELIB_H
 
@@ -58,4 +64,4 @@ typedef struct OCS_MODULE_INFO
 
 extern OCS_STATUS OCS_moduleInfoGet(OCS_MODULE_ID moduleId, OCS_MODULE_INFO *pModuleInfo);
 
-#endif /*  OCS_MODULELIB_H */
+#endif /* OCS_MODULELIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_mqueue.h b/src/unit-test-coverage/ut-stubs/inc/OCS_mqueue.h
index 412384931..2db252260 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_mqueue.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_mqueue.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for mqueue.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for mqueue.h
+ */
+
 #ifndef OCS_MQUEUE_H
 #define OCS_MQUEUE_H
 
@@ -55,4 +61,4 @@ extern int         OCS_mq_timedsend(OCS_mqd_t mqdes, const char *msg_ptr, size_t
                                     const struct OCS_timespec *abs_timeout);
 extern int         OCS_mq_unlink(const char *name);
 
-#endif /*  OCS_MQUEUE_H */
+#endif /* OCS_MQUEUE_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_msgQLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_msgQLib.h
index e9c94ec7b..f430852ed 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_msgQLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_msgQLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for msgQLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for msgQLib.h
+ */
+
 #ifndef OCS_MSGQLIB_H
 #define OCS_MSGQLIB_H
 
@@ -54,4 +60,4 @@ extern OCS_STATUS   OCS_msgQDelete(OCS_MSG_Q_ID msgQId);
 extern int          OCS_msgQReceive(OCS_MSG_Q_ID msgQId, char *buffer, OCS_UINT maxNBytes, int timeout);
 extern OCS_STATUS   OCS_msgQSend(OCS_MSG_Q_ID msgQId, char *buffer, OCS_UINT nBytes, int timeout, int priority);
 
-#endif /*  OCS_MSGQLIB_H */
+#endif /* OCS_MSGQLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_net_if.h b/src/unit-test-coverage/ut-stubs/inc/OCS_net_if.h
index ed4fca017..26cf2810b 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_net_if.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_net_if.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for net/if.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for net/if.h
+ */
+
 #ifndef OCS_NET_IF_H
 #define OCS_NET_IF_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in net/if.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_NET_IF_H */
+#endif /* OCS_NET_IF_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_netdb.h b/src/unit-test-coverage/ut-stubs/inc/OCS_netdb.h
index ffd623ec4..e5a9d554d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_netdb.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_netdb.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for netdb.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for netdb.h
+ */
+
 #ifndef OCS_NETDB_H
 #define OCS_NETDB_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in netdb.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_NETDB_H */
+#endif /* OCS_NETDB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_in.h b/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_in.h
index efbc3333e..7e37be61c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_in.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_in.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for netinet/in.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for netinet/in.h
+ */
+
 #ifndef OCS_NETINET_IN_H
 #define OCS_NETINET_IN_H
 
@@ -41,4 +47,4 @@ extern uint16_t OCS_ntohs(uint16_t netshort);
 extern uint32_t OCS_htonl(uint32_t hostlong);
 extern uint32_t OCS_ntohl(uint32_t netlong);
 
-#endif /*  OCS_NETINET_IN_H */
+#endif /* OCS_NETINET_IN_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_tcp.h b/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_tcp.h
index 7f4349b4e..aedfaeb17 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_tcp.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_netinet_tcp.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for netinet/tcp.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for netinet/tcp.h
+ */
+
 #ifndef OCS_NETINET_TCP_H
 #define OCS_NETINET_TCP_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in netinet/tcp.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_NETINET_TCP_H */
+#endif /* OCS_NETINET_TCP_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_objLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_objLib.h
index 8c9f45c30..201c724c4 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_objLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_objLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for objLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for objLib.h
+ */
+
 #ifndef OCS_OBJLIB_H
 #define OCS_OBJLIB_H
 
@@ -44,4 +50,4 @@
 /* prototypes normally declared in objLib.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_OBJLIB_H */
+#endif /* OCS_OBJLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_poll.h b/src/unit-test-coverage/ut-stubs/inc/OCS_poll.h
index 1bff813f6..e08c14cbb 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_poll.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_poll.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for poll.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for poll.h
+ */
+
 #ifndef OCS_POLL_H
 #define OCS_POLL_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in poll.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_POLL_H */
+#endif /* OCS_POLL_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_pthread.h b/src/unit-test-coverage/ut-stubs/inc/OCS_pthread.h
index 359c60556..89b5b36e8 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_pthread.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_pthread.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for pthread.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for pthread.h
+ */
+
 #ifndef OCS_PTHREAD_H
 #define OCS_PTHREAD_H
 
@@ -122,4 +128,4 @@ extern int OCS_pthread_setschedprio(OCS_pthread_t target_thread, int prio);
 extern int OCS_pthread_setspecific(OCS_pthread_key_t key, const void *pointer);
 extern int OCS_pthread_sigmask(int how, const OCS_sigset_t *set, OCS_sigset_t *oldset);
 
-#endif /*  OCS_PTHREAD_H */
+#endif /* OCS_PTHREAD_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_ramDiskCbio.h b/src/unit-test-coverage/ut-stubs/inc/OCS_ramDiskCbio.h
index d57f9c58c..8512a8f24 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ramDiskCbio.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ramDiskCbio.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ramDiskCbio.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ramDiskCbio.h
+ */
+
 #ifndef OCS_RAMDISKCBIO_H
 #define OCS_RAMDISKCBIO_H
 
@@ -37,4 +43,4 @@
 /* prototypes normally declared in ramDiskCbio.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_RAMDISKCBIO_H */
+#endif /* OCS_RAMDISKCBIO_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_ramDrv.h b/src/unit-test-coverage/ut-stubs/inc/OCS_ramDrv.h
index 464114023..e83c7f758 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ramDrv.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ramDrv.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ramDrv.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ramDrv.h
+ */
+
 #ifndef OCS_RAMDRV_H
 #define OCS_RAMDRV_H
 
@@ -39,4 +45,4 @@
 /* ----------------------------------------- */
 extern OCS_BLK_DEV *OCS_ramDevCreate(char *ramAddr, int bytesPerSec, int secPerTrack, int nSectors, int secOffset);
 
-#endif /*  OCS_RAMDRV_H */
+#endif /* OCS_RAMDRV_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sched.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sched.h
index 3bdfadc54..a0e5a3cea 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sched.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sched.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sched.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sched.h
+ */
+
 #ifndef OCS_SCHED_H
 #define OCS_SCHED_H
 
@@ -45,4 +51,4 @@ struct OCS_sched_param
 extern int OCS_sched_get_priority_max(int policy);
 extern int OCS_sched_get_priority_min(int policy);
 
-#endif /*  OCS_SCHED_H */
+#endif /* OCS_SCHED_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_semLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_semLib.h
index d8979720b..463615e08 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_semLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_semLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for semLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for semLib.h
+ */
+
 #ifndef OCS_SEMLIB_H
 #define OCS_SEMLIB_H
 
@@ -70,4 +76,4 @@ extern OCS_STATUS OCS_semFlush(OCS_SEM_ID semId);
 extern OCS_STATUS OCS_semTake(OCS_SEM_ID semId, int timeout);
 extern OCS_STATUS OCS_semGive(OCS_SEM_ID semId);
 
-#endif /*  OCS_SEMLIB_H */
+#endif /* OCS_SEMLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_semaphore.h b/src/unit-test-coverage/ut-stubs/inc/OCS_semaphore.h
index d09c76dd2..afe030554 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_semaphore.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_semaphore.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for semaphore.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for semaphore.h
+ */
+
 #ifndef OCS_SEMAPHORE_H
 #define OCS_SEMAPHORE_H
 
@@ -49,4 +55,4 @@ extern int OCS_sem_post(OCS_sem_t *sem);
 extern int OCS_sem_timedwait(OCS_sem_t *sem, const struct OCS_timespec *abstime);
 extern int OCS_sem_wait(OCS_sem_t *sem);
 
-#endif /*  OCS_SEMAPHORE_H */
+#endif /* OCS_SEMAPHORE_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_setjmp.h b/src/unit-test-coverage/ut-stubs/inc/OCS_setjmp.h
index 516dff5ce..f512b145e 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_setjmp.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_setjmp.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for setjmp.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for setjmp.h
+ */
+
 #ifndef OCS_SETJMP_H
 #define OCS_SETJMP_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in setjmp.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_SETJMP_H */
+#endif /* OCS_SETJMP_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_shellLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_shellLib.h
index 9a4ed1f0d..2f4fe3b5a 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_shellLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_shellLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for shellLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for shellLib.h
+ */
+
 #ifndef OCS_SHELLLIB_H
 #define OCS_SHELLLIB_H
 
@@ -40,4 +46,4 @@
 extern OCS_STATUS OCS_shellGenericInit(const char *config, int stackSize, const char *shellName, char **pShellName,
                                        OCS_BOOL interactive, OCS_BOOL loginAccess, int fdin, int fdout, int fderr);
 
-#endif /*  OCS_SHELLLIB_H */
+#endif /* OCS_SHELLLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_signal.h b/src/unit-test-coverage/ut-stubs/inc/OCS_signal.h
index 0fde69fc3..815c417a8 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_signal.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_signal.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for signal.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for signal.h
+ */
+
 #ifndef OCS_SIGNAL_H
 #define OCS_SIGNAL_H
 
@@ -74,4 +80,4 @@ extern int              OCS_sigprocmask(int how, const OCS_sigset_t *set, OCS_si
 extern int              OCS_sigsuspend(const OCS_sigset_t *set);
 extern int              OCS_sigwait(const OCS_sigset_t *set, int *sig);
 
-#endif /*  OCS_SIGNAL_H */
+#endif /* OCS_SIGNAL_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_stat.h b/src/unit-test-coverage/ut-stubs/inc/OCS_stat.h
index 92ec7b06c..a4414aa41 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stat.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stat.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stat.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stat.h
+ */
+
 #ifndef OCS_STAT_H
 #define OCS_STAT_H
 
@@ -74,4 +80,4 @@ extern int OCS_fstat(int fd, struct OCS_stat *buf);
 
 extern int OCS_statvfs(const char *file, struct OCS_statvfs *buf);
 
-#endif /*  OCS_STAT_H */
+#endif /* OCS_STAT_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_stdarg.h b/src/unit-test-coverage/ut-stubs/inc/OCS_stdarg.h
index 253786b3d..af416e7b2 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stdarg.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stdarg.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stdarg.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stdarg.h
+ */
+
 #ifndef OCS_STDARG_H
 #define OCS_STDARG_H
 
@@ -43,4 +49,4 @@ typedef struct
 #define OCS_va_start(ap, last) ap.p = &last
 #define OCS_va_end(ap)
 
-#endif /*  OCS_STDARG_H */
+#endif /* OCS_STDARG_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_stdio.h b/src/unit-test-coverage/ut-stubs/inc/OCS_stdio.h
index 9a7cb08fa..69bc56755 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stdio.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stdio.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stdio.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stdio.h
+ */
+
 #ifndef OCS_STDIO_H
 #define OCS_STDIO_H
 
@@ -54,4 +60,4 @@ extern OCS_FILE *OCS_stdin;
 extern OCS_FILE *OCS_stdout;
 extern OCS_FILE *OCS_stderr;
 
-#endif /*  OCS_STDIO_H */
+#endif /* OCS_STDIO_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_stdlib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_stdlib.h
index 9748fbda9..3e2965b99 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stdlib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stdlib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stdlib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stdlib.h
+ */
+
 #ifndef OCS_STDLIB_H
 #define OCS_STDLIB_H
 
@@ -46,4 +52,4 @@ extern int               OCS_system(const char *command);
 extern void *            OCS_malloc(size_t sz);
 extern void              OCS_free(void *ptr);
 
-#endif /*  OCS_STDLIB_H */
+#endif /* OCS_STDLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_string.h b/src/unit-test-coverage/ut-stubs/inc/OCS_string.h
index c0efa0f96..c2b0bb4c2 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_string.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_string.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for string.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for string.h
+ */
+
 #ifndef OCS_STRING_H
 #define OCS_STRING_H
 
@@ -50,4 +56,4 @@ extern char * OCS_strcat(char *dest, const char *src);
 extern char * OCS_strncat(char *dest, const char *src, size_t n);
 extern char * OCS_strerror(int errnum);
 
-#endif /*  OCS_STRING_H */
+#endif /* OCS_STRING_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_strings.h b/src/unit-test-coverage/ut-stubs/inc/OCS_strings.h
index 90cd12424..9287c3df1 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_strings.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_strings.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for strings.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for strings.h
+ */
+
 #ifndef OCS_STRINGS_H
 #define OCS_STRINGS_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in strings.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_STRINGS_H */
+#endif /* OCS_STRINGS_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_symLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_symLib.h
index 4d5b3ab40..b029d9231 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_symLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_symLib.h
@@ -19,9 +19,8 @@
  */
 
 /**
- * \file     OCS_symLib.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
  * OSAL coverage stub replacement for symLib.h
  */
@@ -70,4 +69,4 @@ extern OCS_STATUS  OCS_symFindByName(OCS_SYMTAB_ID symTblId, char *name, char **
 extern OCS_SYMBOL *OCS_symEach(OCS_SYMTAB_ID symTblId, OCS_symEach_Routine_t routine, int routineArg);
 extern OCS_STATUS  OCS_symFind(OCS_SYMTAB_ID symTblId, OCS_SYMBOL_DESC *pSymbol);
 
-#endif /* OCS_SYMLIB_H  */
+#endif /* OCS_SYMLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sysLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sysLib.h
index 4ab7399ee..bfabef420 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sysLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sysLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sysLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sysLib.h
+ */
+
 #ifndef OCS_SYSLIB_H
 #define OCS_SYSLIB_H
 
@@ -38,4 +44,4 @@
 /* ----------------------------------------- */
 extern int OCS_sysClkRateGet(void);
 
-#endif /*  OCS_SYSLIB_H */
+#endif /* OCS_SYSLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ioctl.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ioctl.h
index 3c28cfdd4..65158477c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ioctl.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ioctl.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/ioctl.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/ioctl.h
+ */
+
 #ifndef OCS_SYS_IOCTL_H
 #define OCS_SYS_IOCTL_H
 
@@ -38,4 +44,4 @@
 
 extern int OCS_ioctl(int fd, unsigned long request, ...);
 
-#endif /*  OCS_SYS_IOCTL_H */
+#endif /* OCS_SYS_IOCTL_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ipc.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ipc.h
index cdc2ee19a..b20ba77bd 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ipc.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_ipc.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/ipc.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/ipc.h
+ */
+
 #ifndef OCS_SYS_IPC_H
 #define OCS_SYS_IPC_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in sys/ipc.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_SYS_IPC_H */
+#endif /* OCS_SYS_IPC_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_mman.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_mman.h
index 754dd358b..483458887 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_mman.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_mman.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/mman.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/mman.h
+ */
+
 #ifndef OCS_SYS_MMAN_H
 #define OCS_SYS_MMAN_H
 
@@ -45,4 +51,4 @@
 void *OCS_mmap(void *addr, size_t length, int prot, int flags, int fd, OCS_off_t offset);
 int   OCS_munmap(void *addr, size_t length);
 
-#endif /*  OCS_SYS_MMAN_H */
+#endif /* OCS_SYS_MMAN_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_select.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_select.h
index 57098ca23..3fb64e403 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_select.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_select.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     OCS_sys_select.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
+ * Declarations and prototypes for OCS_sys_select
  */
 
 #ifndef OCS_SYS_SELECT_H
@@ -57,4 +57,4 @@ extern int  OCS_FD_ISSET(int fd, OCS_fd_set *set);
 extern void OCS_FD_CLR(int fd, OCS_fd_set *set);
 extern void OCS_FD_ZERO(OCS_fd_set *set);
 
-#endif /* OCS_SYS_SELECT_H  */
+#endif /* OCS_SYS_SELECT_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_socket.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_socket.h
index 521903731..49cb05f9d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_socket.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_socket.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/socket.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/socket.h
+ */
+
 #ifndef OCS_SYS_SOCKET_H
 #define OCS_SYS_SOCKET_H
 
@@ -86,4 +92,4 @@ extern OCS_ssize_t OCS_sendto(int fd, const void *buf, size_t n, int flags, cons
 extern int         OCS_setsockopt(int fd, int level, int optname, const void *optval, OCS_socklen_t optlen);
 extern int         OCS_socket(int domain, int type, int protocol);
 
-#endif /*  OCS_SYS_SOCKET_H */
+#endif /* OCS_SYS_SOCKET_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_time.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_time.h
index b757f758f..48557de8d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_time.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_time.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/time.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/time.h
+ */
+
 #ifndef OCS_SYS_TIME_H
 #define OCS_SYS_TIME_H
 
@@ -37,4 +43,4 @@
 /* prototypes normally declared in sys/time.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_SYS_TIME_H */
+#endif /* OCS_SYS_TIME_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_times.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_times.h
index 7ae0e2e86..9f4e72517 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_times.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_times.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/times.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/times.h
+ */
+
 #ifndef OCS_SYS_TIMES_H
 #define OCS_SYS_TIMES_H
 
@@ -37,4 +43,4 @@
 /* prototypes normally declared in sys/times.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_SYS_TIMES_H */
+#endif /* OCS_SYS_TIMES_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_types.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_types.h
index 196f3ca83..05281c203 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_types.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_types.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/types.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/types.h
+ */
+
 #ifndef OCS_SYS_TYPES_H
 #define OCS_SYS_TYPES_H
 
@@ -44,4 +50,4 @@ typedef unsigned short int OCS_u_short;
 /* prototypes normally declared in sys/types.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_SYS_TYPES_H */
+#endif /* OCS_SYS_TYPES_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_un.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_un.h
index 558e02dfb..21a9ca3ab 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_un.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_un.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/un.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/un.h
+ */
+
 #ifndef OCS_SYS_UN_H
 #define OCS_SYS_UN_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in sys/un.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_SYS_UN_H */
+#endif /* OCS_SYS_UN_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_wait.h b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_wait.h
index 10627de5d..f2dfeeb1b 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sys_wait.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sys_wait.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/wait.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/wait.h
+ */
+
 #ifndef OCS_SYS_WAIT_H
 #define OCS_SYS_WAIT_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in sys/wait.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_SYS_WAIT_H */
+#endif /* OCS_SYS_WAIT_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_taskLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_taskLib.h
index 3e756dad6..ad6cfbcb8 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_taskLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_taskLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for taskLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for taskLib.h
+ */
+
 #ifndef OCS_TASKLIB_H
 #define OCS_TASKLIB_H
 
@@ -79,4 +85,4 @@ OCS_STATUS OCS_taskInit(OCS_WIND_TCB *pTcb, char *name, int priority, int option
 
 OCS_WIND_TCB *OCS_taskTcb(OCS_TASK_ID tid);
 
-#endif /*  OCS_TASKLIB_H */
+#endif /* OCS_TASKLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_taskVarLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_taskVarLib.h
index 814eaf4be..e3f4f5b42 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_taskVarLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_taskVarLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for taskVarLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for taskVarLib.h
+ */
+
 #ifndef OCS_TASKVARLIB_H
 #define OCS_TASKVARLIB_H
 
@@ -39,4 +45,4 @@
 
 extern OCS_STATUS OCS_taskVarAdd(int tid, int *pVar);
 
-#endif /*  OCS_TASKVARLIB_H */
+#endif /* OCS_TASKVARLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_termios.h b/src/unit-test-coverage/ut-stubs/inc/OCS_termios.h
index 13960a7c5..77d84c87a 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_termios.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_termios.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for termios.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for termios.h
+ */
+
 #ifndef OCS_TERMIOS_H
 #define OCS_TERMIOS_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in termios.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_TERMIOS_H */
+#endif /* OCS_TERMIOS_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_tgmath.h b/src/unit-test-coverage/ut-stubs/inc/OCS_tgmath.h
index fcf5c453c..48d5406e6 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_tgmath.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_tgmath.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for tgmath.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for tgmath.h
+ */
+
 #ifndef OCS_TGMATH_H
 #define OCS_TGMATH_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in tgmath.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_TGMATH_H */
+#endif /* OCS_TGMATH_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_time.h b/src/unit-test-coverage/ut-stubs/inc/OCS_time.h
index 53ecd6317..1b23338d3 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_time.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_time.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for time.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for time.h
+ */
+
 #ifndef OCS_TIME_H
 #define OCS_TIME_H
 
@@ -79,4 +85,4 @@ extern int OCS_timer_settime(OCS_timer_t timerid, int flags, const struct OCS_it
 
 extern int OCS_timer_connect(OCS_timer_t timerid, OCS_TIMER_CONNECT_FUNC func, int arg);
 
-#endif /*  OCS_TIME_H */
+#endif /* OCS_TIME_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_timers.h b/src/unit-test-coverage/ut-stubs/inc/OCS_timers.h
index c8c206fc9..939ee2bfb 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_timers.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_timers.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for timers.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for timers.h
+ */
+
 #ifndef OCS_TIMERS_H
 #define OCS_TIMERS_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in timers.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_TIMERS_H */
+#endif /* OCS_TIMERS_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_ulimit.h b/src/unit-test-coverage/ut-stubs/inc/OCS_ulimit.h
index 5d4dbb487..7ceb1296a 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ulimit.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ulimit.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ulimit.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ulimit.h
+ */
+
 #ifndef OCS_ULIMIT_H
 #define OCS_ULIMIT_H
 
@@ -37,4 +43,4 @@
 /* ----------------------------------------- */
 long OCS_ulimit(int cmd, long newlimit);
 
-#endif /*  OCS_ULIMIT_H */
+#endif /* OCS_ULIMIT_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_unistd.h b/src/unit-test-coverage/ut-stubs/inc/OCS_unistd.h
index cbcd050ea..d1e8e9d45 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_unistd.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_unistd.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for unistd.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for unistd.h
+ */
+
 #ifndef OCS_UNISTD_H
 #define OCS_UNISTD_H
 
@@ -56,4 +62,4 @@ extern int         OCS_rmdir(const char *path);
 extern long int    OCS_sysconf(int name);
 extern OCS_ssize_t OCS_write(int fd, const void *buf, size_t n);
 
-#endif /*  OCS_UNISTD_H */
+#endif /* OCS_UNISTD_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_unldLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_unldLib.h
index b5ada061f..4cb080e21 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_unldLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_unldLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for unldLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for unldLib.h
+ */
+
 #ifndef OCS_UNLDLIB_H
 #define OCS_UNLDLIB_H
 
@@ -39,4 +45,4 @@
 /* ----------------------------------------- */
 extern OCS_STATUS OCS_unldByModuleId(OCS_MODULE_ID moduleId, int options);
 
-#endif /*  OCS_UNLDLIB_H */
+#endif /* OCS_UNLDLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_usrLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_usrLib.h
index d2bdf595d..62f79c773 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_usrLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_usrLib.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for usrLib.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for usrLib.h
+ */
+
 #ifndef OCS_USRLIB_H
 #define OCS_USRLIB_H
 
@@ -37,4 +43,4 @@
 /* prototypes normally declared in usrLib.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_USRLIB_H */
+#endif /* OCS_USRLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_version.h b/src/unit-test-coverage/ut-stubs/inc/OCS_version.h
index c3ac91757..3128f2079 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_version.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_version.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for version.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for version.h
+ */
+
 #ifndef OCS_VERSION_H
 #define OCS_VERSION_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in version.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_VERSION_H */
+#endif /* OCS_VERSION_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_vxWorks.h b/src/unit-test-coverage/ut-stubs/inc/OCS_vxWorks.h
index 534e22204..fd5e56ae7 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_vxWorks.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_vxWorks.h
@@ -19,9 +19,9 @@
  */
 
 /**
- * \file     OCS_vxWorks.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
+ *
  * OSAL coverage stub replacement for vxWorks.h
  */
 
@@ -76,4 +76,4 @@ typedef void (*OCS_VOIDFUNCPTR)(void);
 /* prototypes normally declared in vxWorks.h */
 /* ----------------------------------------- */
 
-#endif /* OCS_VXWORKS_H  */
+#endif /* OCS_VXWORKS_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_wchar.h b/src/unit-test-coverage/ut-stubs/inc/OCS_wchar.h
index 44c5c5674..862527f23 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_wchar.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_wchar.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for wchar.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for wchar.h
+ */
+
 #ifndef OCS_WCHAR_H
 #define OCS_WCHAR_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in wchar.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_WCHAR_H */
+#endif /* OCS_WCHAR_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_wctype.h b/src/unit-test-coverage/ut-stubs/inc/OCS_wctype.h
index 10ea52963..61bdd16ab 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_wctype.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_wctype.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for wctype.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for wctype.h
+ */
+
 #ifndef OCS_WCTYPE_H
 #define OCS_WCTYPE_H
 
@@ -36,4 +42,4 @@
 /* prototypes normally declared in wctype.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_WCTYPE_H */
+#endif /* OCS_WCTYPE_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_xbdBlkDev.h b/src/unit-test-coverage/ut-stubs/inc/OCS_xbdBlkDev.h
index 99a013562..9c5cf2dc1 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_xbdBlkDev.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_xbdBlkDev.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for xbdBlkDev.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for xbdBlkDev.h
+ */
+
 #ifndef OCS_XBDBLKDEV_H
 #define OCS_XBDBLKDEV_H
 
@@ -42,4 +48,4 @@ typedef int OCS_device_t;
 extern OCS_device_t OCS_xbdBlkDevCreateSync(OCS_BLK_DEV *bd, const char *name);
 extern OCS_STATUS   OCS_xbdBlkDevDelete(OCS_device_t dev, OCS_BLK_DEV **ppbd);
 
-#endif /*  OCS_XBDBLKDEV_H */
+#endif /* OCS_XBDBLKDEV_H */
diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_xbdRamDisk.h b/src/unit-test-coverage/ut-stubs/inc/OCS_xbdRamDisk.h
index 1ddaf05e2..a6e371994 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_xbdRamDisk.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_xbdRamDisk.h
@@ -18,7 +18,13 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for xbdRamDisk.h */
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for xbdRamDisk.h
+ */
+
 #ifndef OCS_XBDRAMDISK_H
 #define OCS_XBDRAMDISK_H
 
@@ -37,4 +43,4 @@
 /* prototypes normally declared in xbdRamDisk.h */
 /* ----------------------------------------- */
 
-#endif /*  OCS_XBDRAMDISK_H */
+#endif /* OCS_XBDRAMDISK_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/arpa/inet.h b/src/unit-test-coverage/ut-stubs/override_inc/arpa/inet.h
index 91b93545c..3a2826092 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/arpa/inet.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/arpa/inet.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for arpa/inet.h */
-#ifndef OSAL_OVERRIDE_ARPA_INET_H
-#define OSAL_OVERRIDE_ARPA_INET_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for arpa/inet.h
+ */
+
+#ifndef OVERRIDE_ARPA_INET_H
+#define OVERRIDE_ARPA_INET_H
 
 #include "OCS_arpa_inet.h"
 
@@ -30,4 +36,4 @@
 #define inet_ntop OCS_inet_ntop
 #define inet_pton OCS_inet_pton
 
-#endif /* OSAL_OVERRIDE_ARPA_INET_H */
+#endif /* OVERRIDE_ARPA_INET_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/assert.h b/src/unit-test-coverage/ut-stubs/override_inc/assert.h
index 083898254..b2cd17850 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/assert.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/assert.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for assert.h */
-#ifndef OSAL_OVERRIDE_ASSERT_H
-#define OSAL_OVERRIDE_ASSERT_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for assert.h
+ */
+
+#ifndef OVERRIDE_ASSERT_H
+#define OVERRIDE_ASSERT_H
 
 #include "OCS_assert.h"
 
@@ -30,4 +36,4 @@
 
 #define assert OCS_assert
 
-#endif /* OSAL_OVERRIDE_ASSERT_H */
+#endif /* OVERRIDE_ASSERT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/blkIo.h b/src/unit-test-coverage/ut-stubs/override_inc/blkIo.h
index 981a005b2..dcad37c95 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/blkIo.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/blkIo.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for blkIo.h */
-#ifndef OSAL_OVERRIDE_BLKIO_H
-#define OSAL_OVERRIDE_BLKIO_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for blkIo.h
+ */
+
+#ifndef OVERRIDE_BLKIO_H
+#define OVERRIDE_BLKIO_H
 
 #include "OCS_blkIo.h"
 #include <vxWorks.h>
@@ -32,4 +38,4 @@
 #define BLK_DEV    OCS_BLK_DEV
 #define BLK_DEV_ID OCS_BLK_DEV_ID
 
-#endif /* OSAL_OVERRIDE_BLKIO_H */
+#endif /* OVERRIDE_BLKIO_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/bsp-impl.h b/src/unit-test-coverage/ut-stubs/override_inc/bsp-impl.h
index 1bde70096..74d7d6039 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/bsp-impl.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/bsp-impl.h
@@ -19,14 +19,14 @@
  */
 
 /**
- * \file     bsp-impl.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
+ * Declarations and prototypes for bsp-impl
  */
 
-#ifndef BSP_IMPL_H
-#define BSP_IMPL_H
+#ifndef OVERRIDE_BSP_IMPL_H
+#define OVERRIDE_BSP_IMPL_H
 
 #include "OCS_bsp-impl.h"
 
@@ -43,4 +43,4 @@
    END bsp-impl.h
  *********************/
 
-#endif /* BSP_IMPL_H  */
+#endif /* OVERRIDE_BSP_IMPL_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/cbioLib.h b/src/unit-test-coverage/ut-stubs/override_inc/cbioLib.h
index 4b6a44c74..14555ce5d 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/cbioLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/cbioLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for cbioLib.h */
-#ifndef OSAL_OVERRIDE_CBIOLIB_H
-#define OSAL_OVERRIDE_CBIOLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for cbioLib.h
+ */
+
+#ifndef OVERRIDE_CBIOLIB_H
+#define OVERRIDE_CBIOLIB_H
 
 #include "OCS_cbioLib.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in cbioLib.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_CBIOLIB_H */
+#endif /* OVERRIDE_CBIOLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/complex.h b/src/unit-test-coverage/ut-stubs/override_inc/complex.h
index fd7267ea4..3b79e8b55 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/complex.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/complex.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for complex.h */
-#ifndef OSAL_OVERRIDE_COMPLEX_H
-#define OSAL_OVERRIDE_COMPLEX_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for complex.h
+ */
+
+#ifndef OVERRIDE_COMPLEX_H
+#define OVERRIDE_COMPLEX_H
 
 #include "OCS_complex.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in complex.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_COMPLEX_H */
+#endif /* OVERRIDE_COMPLEX_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/ctype.h b/src/unit-test-coverage/ut-stubs/override_inc/ctype.h
index 9842be2ed..c9d341d25 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ctype.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ctype.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ctype.h */
-#ifndef OSAL_OVERRIDE_CTYPE_H
-#define OSAL_OVERRIDE_CTYPE_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ctype.h
+ */
+
+#ifndef OVERRIDE_CTYPE_H
+#define OVERRIDE_CTYPE_H
 
 #include "OCS_ctype.h"
 
@@ -30,4 +36,4 @@
 
 #define isgraph OCS_isgraph
 
-#endif /* OSAL_OVERRIDE_CTYPE_H */
+#endif /* OVERRIDE_CTYPE_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/dirent.h b/src/unit-test-coverage/ut-stubs/override_inc/dirent.h
index 4b3e706b0..34d15fb2c 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/dirent.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/dirent.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for dirent.h */
-#ifndef OSAL_OVERRIDE_DIRENT_H
-#define OSAL_OVERRIDE_DIRENT_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for dirent.h
+ */
+
+#ifndef OVERRIDE_DIRENT_H
+#define OVERRIDE_DIRENT_H
 
 #include "OCS_dirent.h"
 
@@ -35,4 +41,4 @@
 #define readdir   OCS_readdir
 #define rewinddir OCS_rewinddir
 
-#endif /* OSAL_OVERRIDE_DIRENT_H */
+#endif /* OVERRIDE_DIRENT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/dlfcn.h b/src/unit-test-coverage/ut-stubs/override_inc/dlfcn.h
index ffa3ca272..9841944c0 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/dlfcn.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/dlfcn.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for dlfcn.h */
-#ifndef OSAL_OVERRIDE_DLFCN_H
-#define OSAL_OVERRIDE_DLFCN_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for dlfcn.h
+ */
+
+#ifndef OVERRIDE_DLFCN_H
+#define OVERRIDE_DLFCN_H
 
 #include "OCS_dlfcn.h"
 
@@ -33,4 +39,4 @@
 #define dlopen  OCS_dlopen
 #define dlsym   OCS_dlsym
 
-#endif /* OSAL_OVERRIDE_DLFCN_H */
+#endif /* OVERRIDE_DLFCN_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h b/src/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
index e43ab7127..8d614cff0 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for dosFsLib.h */
-#ifndef OSAL_OVERRIDE_DOSFSLIB_H
-#define OSAL_OVERRIDE_DOSFSLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for dosFsLib.h
+ */
+
+#ifndef OVERRIDE_DOSFSLIB_H
+#define OVERRIDE_DOSFSLIB_H
 
 #include "OCS_dosFsLib.h"
 #include <vxWorks.h>
@@ -36,4 +42,4 @@
 
 #define dosFsVolFormat OCS_dosFsVolFormat
 
-#endif /* OSAL_OVERRIDE_DOSFSLIB_H */
+#endif /* OVERRIDE_DOSFSLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h b/src/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h
index 9e7370008..ffe21300b 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/drv/hdisk/ataDrv.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for drv/hdisk/ataDrv.h */
-#ifndef OSAL_OVERRIDE_DRV_HDISK_ATADRV_H
-#define OSAL_OVERRIDE_DRV_HDISK_ATADRV_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for drv/hdisk/ataDrv.h
+ */
+
+#ifndef OVERRIDE_DRV_HDISK_ATADRV_H
+#define OVERRIDE_DRV_HDISK_ATADRV_H
 
 #include "OCS_drv_hdisk_ataDrv.h"
 #include <vxWorks.h>
@@ -31,4 +37,4 @@
 /* ----------------------------------------- */
 #define ataDevCreate OCS_ataDevCreate
 
-#endif /* OSAL_OVERRIDE_DRV_HDISK_ATADRV_H */
+#endif /* OVERRIDE_DRV_HDISK_ATADRV_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/errno.h b/src/unit-test-coverage/ut-stubs/override_inc/errno.h
index 38735c41a..107415f5e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/errno.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/errno.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for errno.h */
-#ifndef OSAL_OVERRIDE_ERRNO_H
-#define OSAL_OVERRIDE_ERRNO_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for errno.h
+ */
+
+#ifndef OVERRIDE_ERRNO_H
+#define OVERRIDE_ERRNO_H
 
 #include "OCS_errno.h"
 
@@ -40,4 +46,4 @@
 
 #define errno OCS_errno
 
-#endif /* OSAL_OVERRIDE_ERRNO_H */
+#endif /* OVERRIDE_ERRNO_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/errnoLib.h b/src/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
index d1965b2b6..ccb79a0cf 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for errnoLib.h */
-#ifndef OSAL_OVERRIDE_ERRNOLIB_H
-#define OSAL_OVERRIDE_ERRNOLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for errnoLib.h
+ */
+
+#ifndef OVERRIDE_ERRNOLIB_H
+#define OVERRIDE_ERRNOLIB_H
 
 #include "OCS_errnoLib.h"
 #include <vxWorks.h>
@@ -30,4 +36,4 @@
 /* -----------------------------------------  */
 #define errnoGet OCS_errnoGet
 
-#endif /* OSAL_OVERRIDE_ERRNOLIB_H */
+#endif /* OVERRIDE_ERRNOLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/fcntl.h b/src/unit-test-coverage/ut-stubs/override_inc/fcntl.h
index dab3ef734..a133e7934 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/fcntl.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/fcntl.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for fcntl.h */
-#ifndef OSAL_OVERRIDE_FCNTL_H
-#define OSAL_OVERRIDE_FCNTL_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for fcntl.h
+ */
+
+#ifndef OVERRIDE_FCNTL_H
+#define OVERRIDE_FCNTL_H
 
 #include "OCS_fcntl.h"
 
@@ -56,4 +62,4 @@
 #define fcntl OCS_fcntl
 #define open  OCS_open
 
-#endif /* OSAL_OVERRIDE_FCNTL_H */
+#endif /* OVERRIDE_FCNTL_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/fenv.h b/src/unit-test-coverage/ut-stubs/override_inc/fenv.h
index 34a6e6531..159b59b36 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/fenv.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/fenv.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for fenv.h */
-#ifndef OSAL_OVERRIDE_FENV_H
-#define OSAL_OVERRIDE_FENV_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for fenv.h
+ */
+
+#ifndef OVERRIDE_FENV_H
+#define OVERRIDE_FENV_H
 
 #include "OCS_fenv.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in fenv.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_FENV_H */
+#endif /* OVERRIDE_FENV_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/float.h b/src/unit-test-coverage/ut-stubs/override_inc/float.h
index afdf0b572..4e4d10325 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/float.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/float.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for float.h */
-#ifndef OSAL_OVERRIDE_FLOAT_H
-#define OSAL_OVERRIDE_FLOAT_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for float.h
+ */
+
+#ifndef OVERRIDE_FLOAT_H
+#define OVERRIDE_FLOAT_H
 
 #include "OCS_float.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in float.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_FLOAT_H */
+#endif /* OVERRIDE_FLOAT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/hostLib.h b/src/unit-test-coverage/ut-stubs/override_inc/hostLib.h
index add8ec46f..c7adc8034 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/hostLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/hostLib.h
@@ -19,15 +19,14 @@
  */
 
 /**
- * \file     hostLib.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
  * OSAL coverage stub replacement for hostLib.h
  */
 
-#ifndef HOSTLIB_H
-#define HOSTLIB_H
+#ifndef OVERRIDE_HOSTLIB_H
+#define OVERRIDE_HOSTLIB_H
 
 #include "OCS_hostLib.h"
 #include <vxWorks.h>
@@ -37,4 +36,4 @@
 /* ----------------------------------------- */
 #define hostGetByName OCS_hostGetByName
 
-#endif /* HOSTLIB_H  */
+#endif /* OVERRIDE_HOSTLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/intLib.h b/src/unit-test-coverage/ut-stubs/override_inc/intLib.h
index 736f08ad8..45d353ba0 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/intLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/intLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for intLib.h */
-#ifndef OSAL_OVERRIDE_INTLIB_H
-#define OSAL_OVERRIDE_INTLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for intLib.h
+ */
+
+#ifndef OVERRIDE_INTLIB_H
+#define OVERRIDE_INTLIB_H
 
 #include "OCS_intLib.h"
 #include <vxWorks.h>
@@ -36,4 +42,4 @@
 #define intUnlock    OCS_intUnlock
 #define INUM_TO_IVEC OCS_INUM_TO_IVEC
 
-#endif /* OSAL_OVERRIDE_INTLIB_H */
+#endif /* OVERRIDE_INTLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/inttypes.h b/src/unit-test-coverage/ut-stubs/override_inc/inttypes.h
index 2b5633ee6..0e7871c48 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/inttypes.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/inttypes.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for inttypes.h */
-#ifndef OSAL_OVERRIDE_INTTYPES_H
-#define OSAL_OVERRIDE_INTTYPES_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for inttypes.h
+ */
+
+#ifndef OVERRIDE_INTTYPES_H
+#define OVERRIDE_INTTYPES_H
 
 #include "OCS_inttypes.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in inttypes.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_INTTYPES_H */
+#endif /* OVERRIDE_INTTYPES_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/ioLib.h b/src/unit-test-coverage/ut-stubs/override_inc/ioLib.h
index 1ced55120..a9ba0f0cc 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ioLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ioLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ioLib.h */
-#ifndef OSAL_OVERRIDE_IOLIB_H
-#define OSAL_OVERRIDE_IOLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ioLib.h
+ */
+
+#ifndef OVERRIDE_IOLIB_H
+#define OVERRIDE_IOLIB_H
 
 #include "OCS_ioLib.h"
 #include <vxWorks.h>
@@ -33,4 +39,4 @@
 #define FIOUNMOUNT OCS_FIOUNMOUNT
 #define ioctl      OCS_ioctl
 
-#endif /* OSAL_OVERRIDE_IOLIB_H */
+#endif /* OVERRIDE_IOLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/iv.h b/src/unit-test-coverage/ut-stubs/override_inc/iv.h
index e0ec0fdab..8b7506d78 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/iv.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/iv.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for iv.h */
-#ifndef OSAL_OVERRIDE_IV_H
-#define OSAL_OVERRIDE_IV_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for iv.h
+ */
+
+#ifndef OVERRIDE_IV_H
+#define OVERRIDE_IV_H
 
 #include "OCS_iv.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in iv.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_IV_H */
+#endif /* OVERRIDE_IV_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/loadLib.h b/src/unit-test-coverage/ut-stubs/override_inc/loadLib.h
index 00e6a9f1d..7c4c9bef2 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/loadLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/loadLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for loadLib.h */
-#ifndef OSAL_OVERRIDE_LOADLIB_H
-#define OSAL_OVERRIDE_LOADLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for loadLib.h
+ */
+
+#ifndef OVERRIDE_LOADLIB_H
+#define OVERRIDE_LOADLIB_H
 
 #include "OCS_loadLib.h"
 #include <vxWorks.h>
@@ -32,4 +38,4 @@
 
 #define loadModule OCS_loadModule
 
-#endif /* OSAL_OVERRIDE_LOADLIB_H */
+#endif /* OVERRIDE_LOADLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/locale.h b/src/unit-test-coverage/ut-stubs/override_inc/locale.h
index da3c0920b..8095fb262 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/locale.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/locale.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for locale.h */
-#ifndef OSAL_OVERRIDE_LOCALE_H
-#define OSAL_OVERRIDE_LOCALE_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for locale.h
+ */
+
+#ifndef OVERRIDE_LOCALE_H
+#define OVERRIDE_LOCALE_H
 
 #include "OCS_locale.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in locale.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_LOCALE_H */
+#endif /* OVERRIDE_LOCALE_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/logLib.h b/src/unit-test-coverage/ut-stubs/override_inc/logLib.h
index 6be755fbb..9c6132faf 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/logLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/logLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for logLib.h */
-#ifndef OSAL_OVERRIDE_LOGLIB_H
-#define OSAL_OVERRIDE_LOGLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for logLib.h
+ */
+
+#ifndef OVERRIDE_LOGLIB_H
+#define OVERRIDE_LOGLIB_H
 
 #include "OCS_logLib.h"
 #include <vxWorks.h>
@@ -29,4 +35,4 @@
 /* mappings for declarations in logLib.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_LOGLIB_H */
+#endif /* OVERRIDE_LOGLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/math.h b/src/unit-test-coverage/ut-stubs/override_inc/math.h
index 03a60c629..bf52d7fc9 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/math.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/math.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for math.h */
-#ifndef OSAL_OVERRIDE_MATH_H
-#define OSAL_OVERRIDE_MATH_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for math.h
+ */
+
+#ifndef OVERRIDE_MATH_H
+#define OVERRIDE_MATH_H
 
 #include "OCS_math.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in math.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_MATH_H */
+#endif /* OVERRIDE_MATH_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/memPartLib.h b/src/unit-test-coverage/ut-stubs/override_inc/memPartLib.h
index 5cde4f425..eb06a8afe 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/memPartLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/memPartLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for memPartLib.h */
-#ifndef OSAL_OVERRIDE_MEMPARTLIB_H
-#define OSAL_OVERRIDE_MEMPARTLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for memPartLib.h
+ */
+
+#ifndef OVERRIDE_MEMPARTLIB_H
+#define OVERRIDE_MEMPARTLIB_H
 
 #include "OCS_memPartLib.h"
 #include <vxWorks.h>
@@ -35,4 +41,4 @@
 #define memPartInfoGet OCS_memPartInfoGet
 #define memSysPartId   OCS_memSysPartId
 
-#endif /* OSAL_OVERRIDE_MEMPARTLIB_H */
+#endif /* OVERRIDE_MEMPARTLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/moduleLib.h b/src/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
index 5e8957d7e..9995fa763 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for moduleLib.h */
-#ifndef OSAL_OVERRIDE_MODULELIB_H
-#define OSAL_OVERRIDE_MODULELIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for moduleLib.h
+ */
+
+#ifndef OVERRIDE_MODULELIB_H
+#define OVERRIDE_MODULELIB_H
 
 #include "OCS_moduleLib.h"
 #include <vxWorks.h>
@@ -34,4 +40,4 @@
 
 #define moduleInfoGet OCS_moduleInfoGet
 
-#endif /* OSAL_OVERRIDE_MODULELIB_H */
+#endif /* OVERRIDE_MODULELIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/mqueue.h b/src/unit-test-coverage/ut-stubs/override_inc/mqueue.h
index 95f791d65..1fdcff31d 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/mqueue.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/mqueue.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for mqueue.h */
-#ifndef OSAL_OVERRIDE_MQUEUE_H
-#define OSAL_OVERRIDE_MQUEUE_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for mqueue.h
+ */
+
+#ifndef OVERRIDE_MQUEUE_H
+#define OVERRIDE_MQUEUE_H
 
 #include "OCS_mqueue.h"
 #include <time.h>
@@ -39,4 +45,4 @@
 #define mq_timedsend    OCS_mq_timedsend
 #define mq_unlink       OCS_mq_unlink
 
-#endif /* OSAL_OVERRIDE_MQUEUE_H */
+#endif /* OVERRIDE_MQUEUE_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/msgQLib.h b/src/unit-test-coverage/ut-stubs/override_inc/msgQLib.h
index 8bb978f79..35a012a26 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/msgQLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/msgQLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for msgQLib.h */
-#ifndef OSAL_OVERRIDE_MSGQLIB_H
-#define OSAL_OVERRIDE_MSGQLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for msgQLib.h
+ */
+
+#ifndef OVERRIDE_MSGQLIB_H
+#define OVERRIDE_MSGQLIB_H
 
 #include "OCS_msgQLib.h"
 #include <vxWorks.h>
@@ -42,4 +48,4 @@
 #define msgQReceive OCS_msgQReceive
 #define msgQSend    OCS_msgQSend
 
-#endif /* OSAL_OVERRIDE_MSGQLIB_H */
+#endif /* OVERRIDE_MSGQLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/net/if.h b/src/unit-test-coverage/ut-stubs/override_inc/net/if.h
index b530ce1d4..6c9828cf8 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/net/if.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/net/if.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for net/if.h */
-#ifndef OSAL_OVERRIDE_NET_IF_H
-#define OSAL_OVERRIDE_NET_IF_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for net/if.h
+ */
+
+#ifndef OVERRIDE_NET_IF_H
+#define OVERRIDE_NET_IF_H
 
 #include "OCS_net_if.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in net/if.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_NET_IF_H */
+#endif /* OVERRIDE_NET_IF_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/netdb.h b/src/unit-test-coverage/ut-stubs/override_inc/netdb.h
index 693b08916..cce2fdd36 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/netdb.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/netdb.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for netdb.h */
-#ifndef OSAL_OVERRIDE_NETDB_H
-#define OSAL_OVERRIDE_NETDB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for netdb.h
+ */
+
+#ifndef OVERRIDE_NETDB_H
+#define OVERRIDE_NETDB_H
 
 #include "OCS_netdb.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in netdb.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_NETDB_H */
+#endif /* OVERRIDE_NETDB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/netinet/in.h b/src/unit-test-coverage/ut-stubs/override_inc/netinet/in.h
index 574d5a634..d451bcf38 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/netinet/in.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/netinet/in.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for netinet/in.h */
-#ifndef OSAL_OVERRIDE_NETINET_IN_H
-#define OSAL_OVERRIDE_NETINET_IN_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for netinet/in.h
+ */
+
+#ifndef OVERRIDE_NETINET_IN_H
+#define OVERRIDE_NETINET_IN_H
 
 #include "OCS_netinet_in.h"
 
@@ -33,4 +39,4 @@
 #define htonl OCS_htonl
 #define ntohl OCS_ntohl
 
-#endif /* OSAL_OVERRIDE_NETINET_IN_H */
+#endif /* OVERRIDE_NETINET_IN_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/netinet/tcp.h b/src/unit-test-coverage/ut-stubs/override_inc/netinet/tcp.h
index f2f3fd8f3..c10a79f3b 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/netinet/tcp.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/netinet/tcp.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for netinet/tcp.h */
-#ifndef OSAL_OVERRIDE_NETINET_TCP_H
-#define OSAL_OVERRIDE_NETINET_TCP_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for netinet/tcp.h
+ */
+
+#ifndef OVERRIDE_NETINET_TCP_H
+#define OVERRIDE_NETINET_TCP_H
 
 #include "OCS_netinet_tcp.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in netinet/tcp.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_NETINET_TCP_H */
+#endif /* OVERRIDE_NETINET_TCP_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/objLib.h b/src/unit-test-coverage/ut-stubs/override_inc/objLib.h
index 1dc632151..b4bdc329a 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/objLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/objLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for objLib.h */
-#ifndef OSAL_OVERRIDE_OBJLIB_H
-#define OSAL_OVERRIDE_OBJLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for objLib.h
+ */
+
+#ifndef OVERRIDE_OBJLIB_H
+#define OVERRIDE_OBJLIB_H
 
 #include "OCS_objLib.h"
 #include <vxWorks.h>
@@ -36,4 +42,4 @@
 #define S_objLib_OBJ_TIMEOUT     OCS_S_objLib_OBJ_TIMEOUT
 #define S_objLib_OBJ_NO_METHOD   OCS_S_objLib_OBJ_NO_METHOD
 
-#endif /* OSAL_OVERRIDE_OBJLIB_H */
+#endif /* OVERRIDE_OBJLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/poll.h b/src/unit-test-coverage/ut-stubs/override_inc/poll.h
index bd879b5e3..0b942ed8e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/poll.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/poll.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for poll.h */
-#ifndef OSAL_OVERRIDE_POLL_H
-#define OSAL_OVERRIDE_POLL_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for poll.h
+ */
+
+#ifndef OVERRIDE_POLL_H
+#define OVERRIDE_POLL_H
 
 #include "OCS_poll.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in poll.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_POLL_H */
+#endif /* OVERRIDE_POLL_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/pthread.h b/src/unit-test-coverage/ut-stubs/override_inc/pthread.h
index a4b5251d0..09192128a 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/pthread.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/pthread.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for pthread.h */
-#ifndef OSAL_OVERRIDE_PTHREAD_H
-#define OSAL_OVERRIDE_PTHREAD_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for pthread.h
+ */
+
+#ifndef OVERRIDE_PTHREAD_H
+#define OVERRIDE_PTHREAD_H
 
 #include "OCS_pthread.h"
 #include <sched.h>
@@ -76,4 +82,4 @@
 #define pthread_setspecific           OCS_pthread_setspecific
 #define pthread_sigmask               OCS_pthread_sigmask
 
-#endif /* OSAL_OVERRIDE_PTHREAD_H */
+#endif /* OVERRIDE_PTHREAD_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/ramDiskCbio.h b/src/unit-test-coverage/ut-stubs/override_inc/ramDiskCbio.h
index 723259488..d52879649 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ramDiskCbio.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ramDiskCbio.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ramDiskCbio.h */
-#ifndef OSAL_OVERRIDE_RAMDISKCBIO_H
-#define OSAL_OVERRIDE_RAMDISKCBIO_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ramDiskCbio.h
+ */
+
+#ifndef OVERRIDE_RAMDISKCBIO_H
+#define OVERRIDE_RAMDISKCBIO_H
 
 #include "OCS_ramDiskCbio.h"
 #include <vxWorks.h>
@@ -29,4 +35,4 @@
 /* mappings for declarations in ramDiskCbio.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_RAMDISKCBIO_H */
+#endif /* OVERRIDE_RAMDISKCBIO_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/ramDrv.h b/src/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
index e0f68a4fe..20bbce99e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ramDrv.h */
-#ifndef OSAL_OVERRIDE_RAMDRV_H
-#define OSAL_OVERRIDE_RAMDRV_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ramDrv.h
+ */
+
+#ifndef OVERRIDE_RAMDRV_H
+#define OVERRIDE_RAMDRV_H
 
 #include "OCS_ramDrv.h"
 #include <vxWorks.h>
@@ -32,4 +38,4 @@
 
 #define ramDevCreate OCS_ramDevCreate
 
-#endif /* OSAL_OVERRIDE_RAMDRV_H */
+#endif /* OVERRIDE_RAMDRV_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sched.h b/src/unit-test-coverage/ut-stubs/override_inc/sched.h
index 18c0d153b..b57f6663f 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sched.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sched.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sched.h */
-#ifndef OSAL_OVERRIDE_SCHED_H
-#define OSAL_OVERRIDE_SCHED_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sched.h
+ */
+
+#ifndef OVERRIDE_SCHED_H
+#define OVERRIDE_SCHED_H
 
 #include "OCS_sched.h"
 
@@ -36,4 +42,4 @@
 #define sched_get_priority_max OCS_sched_get_priority_max
 #define sched_get_priority_min OCS_sched_get_priority_min
 
-#endif /* OSAL_OVERRIDE_SCHED_H */
+#endif /* OVERRIDE_SCHED_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/selectLib.h b/src/unit-test-coverage/ut-stubs/override_inc/selectLib.h
index d43a2a58b..710b970bc 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/selectLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/selectLib.h
@@ -19,14 +19,14 @@
  */
 
 /**
- * \file     selectLib.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
+ * Declarations and prototypes for selectLib
  */
 
-#ifndef SELECTLIB_H
-#define SELECTLIB_H
+#ifndef OVERRIDE_SELECTLIB_H
+#define OVERRIDE_SELECTLIB_H
 
 #include <vxWorks.h>
 #include <sys/select.h>
@@ -35,4 +35,4 @@
 /* mappings for declarations in selectLib.h */
 /* ----------------------------------------- */
 
-#endif /* SELECTLIB_H  */
+#endif /* OVERRIDE_SELECTLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/semLib.h b/src/unit-test-coverage/ut-stubs/override_inc/semLib.h
index d40ab228f..0d7ac7c15 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/semLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/semLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for semLib.h */
-#ifndef OSAL_OVERRIDE_SEMLIB_H
-#define OSAL_OVERRIDE_SEMLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for semLib.h
+ */
+
+#ifndef OVERRIDE_SEMLIB_H
+#define OVERRIDE_SEMLIB_H
 
 #include "OCS_semLib.h"
 #include <vxWorks.h>
@@ -54,4 +60,4 @@
 #define semTake        OCS_semTake
 #define semGive        OCS_semGive
 
-#endif /* OSAL_OVERRIDE_SEMLIB_H */
+#endif /* OVERRIDE_SEMLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/semaphore.h b/src/unit-test-coverage/ut-stubs/override_inc/semaphore.h
index 6263e4943..3637e12a1 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/semaphore.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/semaphore.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for semaphore.h */
-#ifndef OSAL_OVERRIDE_SEMAPHORE_H
-#define OSAL_OVERRIDE_SEMAPHORE_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for semaphore.h
+ */
+
+#ifndef OVERRIDE_SEMAPHORE_H
+#define OVERRIDE_SEMAPHORE_H
 
 #include "OCS_semaphore.h"
 #include <time.h>
@@ -36,4 +42,4 @@
 #define sem_timedwait OCS_sem_timedwait
 #define sem_wait      OCS_sem_wait
 
-#endif /* OSAL_OVERRIDE_SEMAPHORE_H */
+#endif /* OVERRIDE_SEMAPHORE_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/setjmp.h b/src/unit-test-coverage/ut-stubs/override_inc/setjmp.h
index ebe9e27cd..50a7b364a 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/setjmp.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/setjmp.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for setjmp.h */
-#ifndef OSAL_OVERRIDE_SETJMP_H
-#define OSAL_OVERRIDE_SETJMP_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for setjmp.h
+ */
+
+#ifndef OVERRIDE_SETJMP_H
+#define OVERRIDE_SETJMP_H
 
 #include "OCS_setjmp.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in setjmp.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_SETJMP_H */
+#endif /* OVERRIDE_SETJMP_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/shellLib.h b/src/unit-test-coverage/ut-stubs/override_inc/shellLib.h
index c175be692..2e60afd34 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/shellLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/shellLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for shellLib.h */
-#ifndef OSAL_OVERRIDE_SHELLLIB_H
-#define OSAL_OVERRIDE_SHELLLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for shellLib.h
+ */
+
+#ifndef OVERRIDE_SHELLLIB_H
+#define OVERRIDE_SHELLLIB_H
 
 #include "OCS_shellLib.h"
 #include <vxWorks.h>
@@ -30,4 +36,4 @@
 /* ----------------------------------------- */
 #define shellGenericInit OCS_shellGenericInit
 
-#endif /* OSAL_OVERRIDE_SHELLLIB_H */
+#endif /* OVERRIDE_SHELLLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/signal.h b/src/unit-test-coverage/ut-stubs/override_inc/signal.h
index 1e63a85de..e24fc8a39 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/signal.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/signal.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for signal.h */
-#ifndef OSAL_OVERRIDE_SIGNAL_H
-#define OSAL_OVERRIDE_SIGNAL_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for signal.h
+ */
+
+#ifndef OVERRIDE_SIGNAL_H
+#define OVERRIDE_SIGNAL_H
 
 #include "OCS_signal.h"
 
@@ -56,4 +62,4 @@
 #define sigsuspend  OCS_sigsuspend
 #define sigwait     OCS_sigwait
 
-#endif /* OSAL_OVERRIDE_SIGNAL_H */
+#endif /* OVERRIDE_SIGNAL_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/stat.h b/src/unit-test-coverage/ut-stubs/override_inc/stat.h
index e8760b467..d5229065d 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stat.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stat.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stat.h */
-#ifndef OSAL_OVERRIDE_STAT_H
-#define OSAL_OVERRIDE_STAT_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stat.h
+ */
+
+#ifndef OVERRIDE_STAT_H
+#define OVERRIDE_STAT_H
 
 #include "OCS_stat.h"
 
@@ -40,4 +46,4 @@
 #define statvfs OCS_statvfs
 #define statfs  OCS_statvfs
 
-#endif /* OSAL_OVERRIDE_STAT_H */
+#endif /* OVERRIDE_STAT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/stdarg.h b/src/unit-test-coverage/ut-stubs/override_inc/stdarg.h
index 65e34c40e..7430ca4b3 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stdarg.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stdarg.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stdarg.h */
-#ifndef OSAL_OVERRIDE_STDARG_H
-#define OSAL_OVERRIDE_STDARG_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stdarg.h
+ */
+
+#ifndef OVERRIDE_STDARG_H
+#define OVERRIDE_STDARG_H
 
 #include "OCS_stdarg.h"
 
@@ -32,4 +38,4 @@
 #define va_start(ap, last) OCS_va_start(ap, last)
 #define va_end(ap)         OCS_va_end(ap)
 
-#endif /* OSAL_OVERRIDE_STDARG_H */
+#endif /* OVERRIDE_STDARG_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/stdio.h b/src/unit-test-coverage/ut-stubs/override_inc/stdio.h
index 2ca37d9dd..c069aeb2e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stdio.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stdio.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stdio.h */
-#ifndef OSAL_OVERRIDE_STDIO_H
-#define OSAL_OVERRIDE_STDIO_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stdio.h
+ */
+
+#ifndef OVERRIDE_STDIO_H
+#define OVERRIDE_STDIO_H
 
 #include "OCS_stdio.h"
 
@@ -45,4 +51,4 @@
 #define stdout OCS_stdout
 #define stderr OCS_stderr
 
-#endif /* OSAL_OVERRIDE_STDIO_H */
+#endif /* OVERRIDE_STDIO_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/stdlib.h b/src/unit-test-coverage/ut-stubs/override_inc/stdlib.h
index ca19025a4..0353bd0c8 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stdlib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stdlib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for stdlib.h */
-#ifndef OSAL_OVERRIDE_STDLIB_H
-#define OSAL_OVERRIDE_STDLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for stdlib.h
+ */
+
+#ifndef OVERRIDE_STDLIB_H
+#define OVERRIDE_STDLIB_H
 
 #include "OCS_stdlib.h"
 
@@ -37,4 +43,4 @@
 #define malloc       OCS_malloc
 #define free         OCS_free
 
-#endif /* OSAL_OVERRIDE_STDLIB_H */
+#endif /* OVERRIDE_STDLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/string.h b/src/unit-test-coverage/ut-stubs/override_inc/string.h
index 82ef3a766..d2d59e92e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/string.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/string.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for string.h */
-#ifndef OSAL_OVERRIDE_STRING_H
-#define OSAL_OVERRIDE_STRING_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for string.h
+ */
+
+#ifndef OVERRIDE_STRING_H
+#define OVERRIDE_STRING_H
 
 #include "OCS_string.h"
 
@@ -41,4 +47,4 @@
 #define strncat  OCS_strncat
 #define strerror OCS_strerror
 
-#endif /* OSAL_OVERRIDE_STRING_H */
+#endif /* OVERRIDE_STRING_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/strings.h b/src/unit-test-coverage/ut-stubs/override_inc/strings.h
index ed473d569..132e03098 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/strings.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/strings.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for strings.h */
-#ifndef OSAL_OVERRIDE_STRINGS_H
-#define OSAL_OVERRIDE_STRINGS_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for strings.h
+ */
+
+#ifndef OVERRIDE_STRINGS_H
+#define OVERRIDE_STRINGS_H
 
 #include "OCS_strings.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in strings.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_STRINGS_H */
+#endif /* OVERRIDE_STRINGS_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/symLib.h b/src/unit-test-coverage/ut-stubs/override_inc/symLib.h
index 340f5f1a5..ca43c780c 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/symLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/symLib.h
@@ -19,14 +19,14 @@
  */
 
 /**
- * \file     symLib.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
+ * Declarations and prototypes for symLib
  */
 
-#ifndef SYMLIB_H
-#define SYMLIB_H
+#ifndef OVERRIDE_SYMLIB_H
+#define OVERRIDE_SYMLIB_H
 
 #include "OCS_symLib.h"
 #include <vxWorks.h>
@@ -51,4 +51,4 @@
 #define symEach       OCS_symEach
 #define symFind       OCS_symFind
 
-#endif /* SYMLIB_H  */
+#endif /* OVERRIDE_SYMLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/ioctl.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/ioctl.h
index 97daa628d..22d35e421 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/ioctl.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/ioctl.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/ioctl.h */
-#ifndef OSAL_OVERRIDE_SYS_IOCTL_H
-#define OSAL_OVERRIDE_SYS_IOCTL_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/ioctl.h
+ */
+
+#ifndef OVERRIDE_SYS_IOCTL_H
+#define OVERRIDE_SYS_IOCTL_H
 
 #include "OCS_sys_ioctl.h"
 
@@ -30,4 +36,4 @@
 
 #define ioctl OCS_ioctl
 
-#endif /* OSAL_OVERRIDE_SYS_IOCTL_H */
+#endif /* OVERRIDE_SYS_IOCTL_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/ipc.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/ipc.h
index 7729af5f8..0f50ad0ce 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/ipc.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/ipc.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/ipc.h */
-#ifndef OSAL_OVERRIDE_SYS_IPC_H
-#define OSAL_OVERRIDE_SYS_IPC_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/ipc.h
+ */
+
+#ifndef OVERRIDE_SYS_IPC_H
+#define OVERRIDE_SYS_IPC_H
 
 #include "OCS_sys_ipc.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in sys/ipc.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_SYS_IPC_H */
+#endif /* OVERRIDE_SYS_IPC_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/mman.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/mman.h
index 9a64e0fc2..48d5435a8 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/mman.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/mman.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/mman.h */
-#ifndef OSAL_OVERRIDE_SYS_MMAN_H
-#define OSAL_OVERRIDE_SYS_MMAN_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/mman.h
+ */
+
+#ifndef OVERRIDE_SYS_MMAN_H
+#define OVERRIDE_SYS_MMAN_H
 
 #include "OCS_sys_mman.h"
 
@@ -38,4 +44,4 @@
 #define mmap        OCS_mmap
 #define munmap      OCS_munmap
 
-#endif /* OSAL_OVERRIDE_SYS_MMAN_H */
+#endif /* OVERRIDE_SYS_MMAN_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/select.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/select.h
index 8db827c2b..09e79e7b2 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/select.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/select.h
@@ -19,14 +19,14 @@
  */
 
 /**
- * \file     select.h
- * \ingroup  override_inc
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
+ * Declarations and prototypes for select
  */
 
-#ifndef SELECT_H
-#define SELECT_H
+#ifndef OVERRIDE_SYS_SELECT_H
+#define OVERRIDE_SYS_SELECT_H
 
 #include "OCS_sys_select.h"
 
@@ -52,4 +52,4 @@
 
 #define FD_SETSIZE OCS_FD_SETSIZE
 
-#endif /* SELECT_H  */
+#endif /* OVERRIDE_SYS_SELECT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/signal.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/signal.h
index 0304c264e..1d7fea8c2 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/signal.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/signal.h
@@ -18,11 +18,17 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/signal.h */
-#ifndef OSAL_OVERRIDE_SYS_SIGNAL_H
-#define OSAL_OVERRIDE_SYS_SIGNAL_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/signal.h
+ */
+
+#ifndef OVERRIDE_SYS_SIGNAL_H
+#define OVERRIDE_SYS_SIGNAL_H
 
 /* alias to signal.h */
 #include <signal.h>
 
-#endif /* OSAL_OVERRIDE_SYS_SIGNAL_H */
+#endif /* OVERRIDE_SYS_SIGNAL_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/socket.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/socket.h
index bec5af131..5d229e209 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/socket.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/socket.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/socket.h */
-#ifndef OSAL_OVERRIDE_SYS_SOCKET_H
-#define OSAL_OVERRIDE_SYS_SOCKET_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/socket.h
+ */
+
+#ifndef OVERRIDE_SYS_SOCKET_H
+#define OVERRIDE_SYS_SOCKET_H
 
 #include "OCS_sys_socket.h"
 
@@ -55,4 +61,4 @@
 #define SO_ERROR     OCS_SO_ERROR
 #define MSG_DONTWAIT OCS_MSG_DONTWAIT
 
-#endif /* OSAL_OVERRIDE_SYS_SOCKET_H */
+#endif /* OVERRIDE_SYS_SOCKET_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/stat.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/stat.h
index b6f5d80ce..455580de7 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/stat.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/stat.h
@@ -18,11 +18,17 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/stat.h */
-#ifndef OSAL_OVERRIDE_SYS_STAT_H
-#define OSAL_OVERRIDE_SYS_STAT_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/stat.h
+ */
+
+#ifndef OVERRIDE_SYS_STAT_H
+#define OVERRIDE_SYS_STAT_H
 
 /* alias to stat.h */
 #include <stat.h>
 
-#endif /* OSAL_OVERRIDE_SYS_STAT_H */
+#endif /* OVERRIDE_SYS_STAT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/statvfs.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/statvfs.h
index 7d53a30e2..574e2f1bb 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/statvfs.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/statvfs.h
@@ -18,11 +18,17 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/statvfs.h */
-#ifndef OSAL_OVERRIDE_SYS_STATVFS_H
-#define OSAL_OVERRIDE_SYS_STATVFS_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/statvfs.h
+ */
+
+#ifndef OVERRIDE_SYS_STATVFS_H
+#define OVERRIDE_SYS_STATVFS_H
 
 /* alias to stat.h */
 #include <stat.h>
 
-#endif /* OSAL_OVERRIDE_SYS_STATVFS_H */
+#endif /* OVERRIDE_SYS_STATVFS_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/time.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/time.h
index ced41f62b..32cb8d356 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/time.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/time.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/time.h */
-#ifndef OSAL_OVERRIDE_SYS_TIME_H
-#define OSAL_OVERRIDE_SYS_TIME_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/time.h
+ */
+
+#ifndef OVERRIDE_SYS_TIME_H
+#define OVERRIDE_SYS_TIME_H
 
 #include "OCS_sys_time.h"
 #include <time.h>
@@ -29,4 +35,4 @@
 /* mappings for declarations in sys/time.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_SYS_TIME_H */
+#endif /* OVERRIDE_SYS_TIME_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/times.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/times.h
index 810e64ce9..1311e334e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/times.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/times.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/times.h */
-#ifndef OSAL_OVERRIDE_SYS_TIMES_H
-#define OSAL_OVERRIDE_SYS_TIMES_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/times.h
+ */
+
+#ifndef OVERRIDE_SYS_TIMES_H
+#define OVERRIDE_SYS_TIMES_H
 
 #include "OCS_sys_times.h"
 #include <time.h>
@@ -29,4 +35,4 @@
 /* mappings for declarations in sys/times.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_SYS_TIMES_H */
+#endif /* OVERRIDE_SYS_TIMES_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/types.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/types.h
index 57dc1b06a..ba2258598 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/types.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/types.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/types.h */
-#ifndef OSAL_OVERRIDE_SYS_TYPES_H
-#define OSAL_OVERRIDE_SYS_TYPES_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/types.h
+ */
+
+#ifndef OVERRIDE_SYS_TYPES_H
+#define OVERRIDE_SYS_TYPES_H
 
 #include "OCS_sys_types.h"
 
@@ -35,4 +41,4 @@
 #define uid_t   OCS_uid_t
 #define u_short OCS_u_short
 
-#endif /* OSAL_OVERRIDE_SYS_TYPES_H */
+#endif /* OVERRIDE_SYS_TYPES_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/un.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/un.h
index fa11207fc..1fb648ea1 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/un.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/un.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/un.h */
-#ifndef OSAL_OVERRIDE_SYS_UN_H
-#define OSAL_OVERRIDE_SYS_UN_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/un.h
+ */
+
+#ifndef OVERRIDE_SYS_UN_H
+#define OVERRIDE_SYS_UN_H
 
 #include "OCS_sys_un.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in sys/un.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_SYS_UN_H */
+#endif /* OVERRIDE_SYS_UN_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sys/wait.h b/src/unit-test-coverage/ut-stubs/override_inc/sys/wait.h
index 056695e1d..b40b1520b 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sys/wait.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sys/wait.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sys/wait.h */
-#ifndef OSAL_OVERRIDE_SYS_WAIT_H
-#define OSAL_OVERRIDE_SYS_WAIT_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sys/wait.h
+ */
+
+#ifndef OVERRIDE_SYS_WAIT_H
+#define OVERRIDE_SYS_WAIT_H
 
 #include "OCS_sys_wait.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in sys/wait.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_SYS_WAIT_H */
+#endif /* OVERRIDE_SYS_WAIT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/sysLib.h b/src/unit-test-coverage/ut-stubs/override_inc/sysLib.h
index a12d6f2aa..d10e055da 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sysLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sysLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for sysLib.h */
-#ifndef OSAL_OVERRIDE_SYSLIB_H
-#define OSAL_OVERRIDE_SYSLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for sysLib.h
+ */
+
+#ifndef OVERRIDE_SYSLIB_H
+#define OVERRIDE_SYSLIB_H
 
 #include "OCS_sysLib.h"
 #include <vxWorks.h>
@@ -30,4 +36,4 @@
 /* ----------------------------------------- */
 #define sysClkRateGet OCS_sysClkRateGet
 
-#endif /* OSAL_OVERRIDE_SYSLIB_H */
+#endif /* OVERRIDE_SYSLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/taskLib.h b/src/unit-test-coverage/ut-stubs/override_inc/taskLib.h
index 8ad9d6a66..29cd06310 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/taskLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/taskLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for taskLib.h */
-#ifndef OSAL_OVERRIDE_TASKLIB_H
-#define OSAL_OVERRIDE_TASKLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for taskLib.h
+ */
+
+#ifndef OVERRIDE_TASKLIB_H
+#define OVERRIDE_TASKLIB_H
 
 #include "OCS_taskLib.h"
 #include <vxWorks.h>
@@ -53,4 +59,4 @@
 #define taskInit        OCS_taskInit
 #define taskTcb         OCS_taskTcb
 
-#endif /* OSAL_OVERRIDE_TASKLIB_H */
+#endif /* OVERRIDE_TASKLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/taskVarLib.h b/src/unit-test-coverage/ut-stubs/override_inc/taskVarLib.h
index c0b30e6b1..888b7bfd6 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/taskVarLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/taskVarLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for taskVarLib.h */
-#ifndef OSAL_OVERRIDE_TASKVARLIB_H
-#define OSAL_OVERRIDE_TASKVARLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for taskVarLib.h
+ */
+
+#ifndef OVERRIDE_TASKVARLIB_H
+#define OVERRIDE_TASKVARLIB_H
 
 #include "OCS_taskVarLib.h"
 #include <vxWorks.h>
@@ -31,4 +37,4 @@
 
 #define taskVarAdd OCS_taskVarAdd
 
-#endif /* OSAL_OVERRIDE_TASKVARLIB_H */
+#endif /* OVERRIDE_TASKVARLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/termios.h b/src/unit-test-coverage/ut-stubs/override_inc/termios.h
index e0778df4c..6bfeb3073 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/termios.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/termios.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for termios.h */
-#ifndef OSAL_OVERRIDE_TERMIOS_H
-#define OSAL_OVERRIDE_TERMIOS_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for termios.h
+ */
+
+#ifndef OVERRIDE_TERMIOS_H
+#define OVERRIDE_TERMIOS_H
 
 #include "OCS_termios.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in termios.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_TERMIOS_H */
+#endif /* OVERRIDE_TERMIOS_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/tgmath.h b/src/unit-test-coverage/ut-stubs/override_inc/tgmath.h
index a30170916..f54c7d784 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/tgmath.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/tgmath.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for tgmath.h */
-#ifndef OSAL_OVERRIDE_TGMATH_H
-#define OSAL_OVERRIDE_TGMATH_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for tgmath.h
+ */
+
+#ifndef OVERRIDE_TGMATH_H
+#define OVERRIDE_TGMATH_H
 
 #include "OCS_tgmath.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in tgmath.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_TGMATH_H */
+#endif /* OVERRIDE_TGMATH_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/time.h b/src/unit-test-coverage/ut-stubs/override_inc/time.h
index f0fdd91ba..e286a1ea0 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/time.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/time.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for time.h */
-#ifndef OSAL_OVERRIDE_TIME_H
-#define OSAL_OVERRIDE_TIME_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for time.h
+ */
+
+#ifndef OVERRIDE_TIME_H
+#define OVERRIDE_TIME_H
 
 #include "OCS_time.h"
 
@@ -51,4 +57,4 @@
 #define timer_settime   OCS_timer_settime
 #define timer_connect   OCS_timer_connect
 
-#endif /* OSAL_OVERRIDE_TIME_H */
+#endif /* OVERRIDE_TIME_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/timers.h b/src/unit-test-coverage/ut-stubs/override_inc/timers.h
index d52461e71..3fefd7ae1 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/timers.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/timers.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for timers.h */
-#ifndef OSAL_OVERRIDE_TIMERS_H
-#define OSAL_OVERRIDE_TIMERS_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for timers.h
+ */
+
+#ifndef OVERRIDE_TIMERS_H
+#define OVERRIDE_TIMERS_H
 
 #include "OCS_timers.h"
 #include <time.h>
@@ -29,4 +35,4 @@
  * Note: this is just an alias for time.h
  */
 
-#endif /* OSAL_OVERRIDE_TIMERS_H */
+#endif /* OVERRIDE_TIMERS_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/ulimit.h b/src/unit-test-coverage/ut-stubs/override_inc/ulimit.h
index d9029e798..6a3682746 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ulimit.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ulimit.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for ulimit.h */
-#ifndef OSAL_OVERRIDE_ULIMIT_H
-#define OSAL_OVERRIDE_ULIMIT_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for ulimit.h
+ */
+
+#ifndef OVERRIDE_ULIMIT_H
+#define OVERRIDE_ULIMIT_H
 
 #include "OCS_ulimit.h"
 
@@ -29,4 +35,4 @@
 /* ----------------------------------------- */
 #define ulimit OCS_ulimit
 
-#endif /* OSAL_OVERRIDE_ULIMIT_H */
+#endif /* OVERRIDE_ULIMIT_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/unistd.h b/src/unit-test-coverage/ut-stubs/override_inc/unistd.h
index becea6988..09d2b3601 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/unistd.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/unistd.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for unistd.h */
-#ifndef OSAL_OVERRIDE_UNISTD_H
-#define OSAL_OVERRIDE_UNISTD_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for unistd.h
+ */
+
+#ifndef OVERRIDE_UNISTD_H
+#define OVERRIDE_UNISTD_H
 
 #include "OCS_unistd.h"
 
@@ -47,4 +53,4 @@
 #define sysconf     OCS_sysconf
 #define write       OCS_write
 
-#endif /* OSAL_OVERRIDE_UNISTD_H */
+#endif /* OVERRIDE_UNISTD_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/unldLib.h b/src/unit-test-coverage/ut-stubs/override_inc/unldLib.h
index b785a8784..b256768bd 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/unldLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/unldLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for unldLib.h */
-#ifndef OSAL_OVERRIDE_UNLDLIB_H
-#define OSAL_OVERRIDE_UNLDLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for unldLib.h
+ */
+
+#ifndef OVERRIDE_UNLDLIB_H
+#define OVERRIDE_UNLDLIB_H
 
 #include "OCS_unldLib.h"
 #include <vxWorks.h>
@@ -31,4 +37,4 @@
 /* ----------------------------------------- */
 #define unldByModuleId OCS_unldByModuleId
 
-#endif /* OSAL_OVERRIDE_UNLDLIB_H */
+#endif /* OVERRIDE_UNLDLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/usrLib.h b/src/unit-test-coverage/ut-stubs/override_inc/usrLib.h
index 8139f7488..c3b1ad56c 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/usrLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/usrLib.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for usrLib.h */
-#ifndef OSAL_OVERRIDE_USRLIB_H
-#define OSAL_OVERRIDE_USRLIB_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for usrLib.h
+ */
+
+#ifndef OVERRIDE_USRLIB_H
+#define OVERRIDE_USRLIB_H
 
 #include "OCS_usrLib.h"
 #include <vxWorks.h>
@@ -29,4 +35,4 @@
 /* mappings for declarations in usrLib.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_USRLIB_H */
+#endif /* OVERRIDE_USRLIB_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/version.h b/src/unit-test-coverage/ut-stubs/override_inc/version.h
index 95980c7ab..25cf491f6 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/version.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/version.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for version.h */
-#ifndef OSAL_OVERRIDE_VERSION_H
-#define OSAL_OVERRIDE_VERSION_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for version.h
+ */
+
+#ifndef OVERRIDE_VERSION_H
+#define OVERRIDE_VERSION_H
 
 #include "OCS_version.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in version.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_VERSION_H */
+#endif /* OVERRIDE_VERSION_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/vxWorks.h b/src/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
index 93c28febd..6458fc4fc 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
@@ -19,14 +19,14 @@
  */
 
 /**
- * \file     vxWorks.h
- * \ingroup  ut-stubs
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup ut-stubs
  *
+ * Declarations and prototypes for vxWorks
  */
 
-#ifndef VXWORKS_H
-#define VXWORKS_H
+#ifndef OVERRIDE_VXWORKS_H
+#define OVERRIDE_VXWORKS_H
 
 #include "OCS_vxWorks.h"
 
@@ -53,4 +53,4 @@
 
 #define _Vx_usr_arg_t OCS_Vx_usr_arg_t
 
-#endif /* VXWORKS_H  */
+#endif /* OVERRIDE_VXWORKS_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/wchar.h b/src/unit-test-coverage/ut-stubs/override_inc/wchar.h
index 6aaaaf783..fb3df8dbf 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/wchar.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/wchar.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for wchar.h */
-#ifndef OSAL_OVERRIDE_WCHAR_H
-#define OSAL_OVERRIDE_WCHAR_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for wchar.h
+ */
+
+#ifndef OVERRIDE_WCHAR_H
+#define OVERRIDE_WCHAR_H
 
 #include "OCS_wchar.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in wchar.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_WCHAR_H */
+#endif /* OVERRIDE_WCHAR_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/wctype.h b/src/unit-test-coverage/ut-stubs/override_inc/wctype.h
index b0458a749..8215dfee9 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/wctype.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/wctype.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for wctype.h */
-#ifndef OSAL_OVERRIDE_WCTYPE_H
-#define OSAL_OVERRIDE_WCTYPE_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for wctype.h
+ */
+
+#ifndef OVERRIDE_WCTYPE_H
+#define OVERRIDE_WCTYPE_H
 
 #include "OCS_wctype.h"
 
@@ -28,4 +34,4 @@
 /* mappings for declarations in wctype.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_WCTYPE_H */
+#endif /* OVERRIDE_WCTYPE_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h b/src/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
index 20bc0dfcb..b6d75f740 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for xbdBlkDev.h */
-#ifndef OSAL_OVERRIDE_XBDBLKDEV_H
-#define OSAL_OVERRIDE_XBDBLKDEV_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for xbdBlkDev.h
+ */
+
+#ifndef OVERRIDE_XBDBLKDEV_H
+#define OVERRIDE_XBDBLKDEV_H
 
 #include "OCS_xbdBlkDev.h"
 #include <vxWorks.h>
@@ -35,4 +41,4 @@
 #define xbdBlkDevCreateSync OCS_xbdBlkDevCreateSync
 #define xbdBlkDevDelete     OCS_xbdBlkDevDelete
 
-#endif /* OSAL_OVERRIDE_XBDBLKDEV_H */
+#endif /* OVERRIDE_XBDBLKDEV_H */
diff --git a/src/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h b/src/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
index 57f9db894..8d1f11082 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
@@ -18,9 +18,15 @@
  *  limitations under the License.
  */
 
-/* OSAL coverage stub replacement for xbdRamDisk.h */
-#ifndef OSAL_OVERRIDE_XBDRAMDISK_H
-#define OSAL_OVERRIDE_XBDRAMDISK_H
+/**
+ * \file
+ * \ingroup ut-stubs
+ *
+ * OSAL coverage stub replacement for xbdRamDisk.h
+ */
+
+#ifndef OVERRIDE_XBDRAMDISK_H
+#define OVERRIDE_XBDRAMDISK_H
 
 #include "OCS_xbdRamDisk.h"
 #include <vxWorks.h>
@@ -29,4 +35,4 @@
 /* mappings for declarations in xbdRamDisk.h */
 /* ----------------------------------------- */
 
-#endif /* OSAL_OVERRIDE_XBDRAMDISK_H */
+#endif /* OVERRIDE_XBDRAMDISK_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-binsem.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-binsem.h
index e3ced2751..d2778dce9 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-binsem.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-binsem.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-binsem.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-binsem
  */
 
 #ifndef UT_ADAPTOR_BINSEM_H
@@ -48,4 +48,4 @@ extern const UT_EntryKey_t UT_StubKey_GenericSemGive;
 
 extern int32 UT_Call_OS_VxWorks_BinSemAPI_Impl_Init(void);
 
-#endif /* UT_ADAPTOR_BINSEM_H  */
+#endif /* UT_ADAPTOR_BINSEM_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-common.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-common.h
index ece0fa66c..f6597a5cf 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-common.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-common.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-common.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-common
  */
 
 #ifndef UT_ADAPTOR_COMMON_H
@@ -55,4 +55,4 @@ extern int32 OS_VxWorks_GenericSemGive(OCS_SEM_ID vxid);
  */
 extern const UT_EntryKey_t UT_StubKey_OS_VxWorks_TableMutex_Init;
 
-#endif /* UT_ADAPTOR_COMMON_H  */
+#endif /* UT_ADAPTOR_COMMON_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-console.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-console.h
index 2d45fbafb..73890d11b 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-console.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-console.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-console.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-console
  */
 
 #ifndef UT_ADAPTOR_CONSOLE_H
@@ -44,4 +44,4 @@ extern void UT_ConsoleTest_TaskEntry(int arg);
  */
 extern void UT_ConsoleTest_SetConsoleAsync(osal_index_t local_id, bool is_async);
 
-#endif /* UT_ADAPTOR_CONSOLE_H  */
+#endif /* UT_ADAPTOR_CONSOLE_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-countsem.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-countsem.h
index 57eb05ac5..f42c55cb6 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-countsem.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-countsem.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-countsem.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-countsem
  */
 
 #ifndef UT_ADAPTOR_COUNTSEM_H
@@ -46,4 +46,4 @@ extern size_t const UT_Ref_OS_impl_count_sem_table_SIZE;
 
 int32 UT_Call_OS_VxWorks_CountSemAPI_Impl_Init(void);
 
-#endif /* UT_ADAPTOR_COUNTSEM_H  */
+#endif /* UT_ADAPTOR_COUNTSEM_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-dirs.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-dirs.h
index d528b209e..87f92704a 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-dirs.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-dirs.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-dirs.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-dirs
  */
 
 #ifndef UT_ADAPTOR_DIRS_H
@@ -44,4 +44,4 @@
  */
 extern int32 UT_Call_OS_VxWorks_DirAPI_Impl_Init(void);
 
-#endif /* UT_ADAPTOR_DIRS_H  */
+#endif /* UT_ADAPTOR_DIRS_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-files.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-files.h
index a77d79ce8..3de4aa2bd 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-files.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-files.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-files.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-files
  */
 
 #ifndef UT_ADAPTOR_FILES_H
@@ -55,4 +55,4 @@ unsigned int UT_FileTest_GetSelfEGID(void);
 
 void UT_FileTest_Set_Selectable(osal_index_t local_id, bool is_selectable);
 
-#endif /* UT_ADAPTOR_FILES_H  */
+#endif /* UT_ADAPTOR_FILES_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filesys.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filesys.h
index 88242f384..3fdad1fa1 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filesys.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filesys.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-filesys.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-filesys
  */
 
 #ifndef UT_ADAPTOR_FILESYS_H
@@ -36,4 +36,4 @@ extern size_t const UT_Ref_OS_impl_filesys_table_SIZE;
 
 void UT_FileSysTest_SetupFileSysEntry(osal_index_t id, OCS_BLK_DEV *blkdev, OCS_device_t xbddev, uint32 MaxParts);
 
-#endif /* UT_ADAPTOR_FILESYS_H  */
+#endif /* UT_ADAPTOR_FILESYS_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filetable-stub.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filetable-stub.h
index 06c1226ca..4205fdbe9 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filetable-stub.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-filetable-stub.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-filetable-stub.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-filetable-stub
  */
 
 #ifndef UT_ADAPTOR_FILETABLE_STUB_H
@@ -34,4 +34,4 @@
 extern void *const  UT_FileTableTest_OS_impl_filehandle_table;
 extern size_t const UT_FileTableTest_OS_impl_filehandle_table_SIZE;
 
-#endif /* UT_ADAPTOR_FILETABLE_STUB_H  */
+#endif /* UT_ADAPTOR_FILETABLE_STUB_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-idmap.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-idmap.h
index b3483c92d..0ccb753e4 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-idmap.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-idmap.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-idmap.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-idmap
  */
 
 #ifndef UT_ADAPTOR_IDMAP_H
@@ -42,4 +42,4 @@
 int32 UT_Call_OS_VxWorks_TableMutex_Init(osal_objtype_t idtype);
 void  UT_IdMapTest_SetImplTableMutex(osal_objtype_t idtype, OCS_SEM_ID vxid);
 
-#endif /* UT_ADAPTOR_IDMAP_H  */
+#endif /* UT_ADAPTOR_IDMAP_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-loader.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-loader.h
index 71dbe1c1f..a26dda771 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-loader.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-loader.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-loader.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-loader
  */
 
 #ifndef UT_ADAPTOR_LOADER_H
@@ -38,4 +38,4 @@ extern size_t const UT_Ref_OS_impl_module_table_SIZE;
 
 extern int32 UT_Call_OS_VxWorks_ModuleAPI_Impl_Init(void);
 
-#endif /* UT_ADAPTOR_LOADER_H  */
+#endif /* UT_ADAPTOR_LOADER_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-mutex.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-mutex.h
index d92366e3c..dbc1a23a6 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-mutex.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-mutex.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-mutex.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-mutex
  */
 
 #ifndef UT_ADAPTOR_MUTEX_H
@@ -46,4 +46,4 @@ extern size_t const UT_Ref_OS_impl_mutex_table_SIZE;
 
 int32 UT_Call_OS_VxWorks_MutexAPI_Impl_Init(void);
 
-#endif /* UT_ADAPTOR_MUTEX_H  */
+#endif /* UT_ADAPTOR_MUTEX_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-queues.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-queues.h
index 6ea819a9b..0310627ed 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-queues.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-queues.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-queues.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-queues
  */
 
 #ifndef UT_ADAPTOR_QUEUES_H
@@ -45,4 +45,4 @@ extern size_t const UT_Ref_OS_impl_queue_table_SIZE;
 
 int32 UT_Call_OS_VxWorks_QueueAPI_Impl_Init(void);
 
-#endif /* UT_ADAPTOR_QUEUES_H  */
+#endif /* UT_ADAPTOR_QUEUES_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-symtab.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-symtab.h
index 9e8f1a32f..c5c94b468 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-symtab.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-symtab.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-symtab.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-symtab
  */
 
 #ifndef UT_ADAPTOR_SYMTAB_H
@@ -32,4 +32,4 @@
 
 int32 UT_SymTabTest_CallIteratorFunc(const char *name, void *val, size_t TestSize, size_t SizeLimit);
 
-#endif /* UT_ADAPTOR_SYMTAB_H  */
+#endif /* UT_ADAPTOR_SYMTAB_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-tasks.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-tasks.h
index 6a147f521..92c8abab5 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-tasks.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-tasks.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-tasks.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-tasks
  */
 
 #ifndef UT_ADAPTOR_TASKS_H
@@ -48,4 +48,4 @@ void          UT_TaskTest_SetImplTaskId(osal_index_t local_id, OCS_TASK_ID TaskI
 int           UT_TaskTest_CallEntryPoint(osal_id_t arg);
 OCS_WIND_TCB *UT_TaskTest_GetTaskTcb(osal_index_t local_id);
 
-#endif /* UT_ADAPTOR_TASKS_H  */
+#endif /* UT_ADAPTOR_TASKS_H */
diff --git a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-timebase.h b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-timebase.h
index 6317489c5..557bb9d73 100644
--- a/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-timebase.h
+++ b/src/unit-test-coverage/vxworks/adaptors/inc/ut-adaptor-timebase.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     ut-adaptor-timebase.h
- * \ingroup  adaptors
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup adaptors
  *
+ * Declarations and prototypes for ut-adaptor-timebase
  */
 
 #ifndef UT_ADAPTOR_TIMEBASE_H
@@ -62,4 +62,4 @@ bool UT_TimeBaseTest_CheckTimeBaseErrorState(osal_index_t local_id);
 /* Invoke the internal UsecToTimespec API */
 void UT_TimeBaseTest_UsecToTimespec(uint32 usecs, struct OCS_timespec *time_spec);
 
-#endif /* UT_ADAPTOR_TIMEBASE_H  */
+#endif /* UT_ADAPTOR_TIMEBASE_H */
diff --git a/src/unit-test-coverage/vxworks/src/os-vxworks-coveragetest.h b/src/unit-test-coverage/vxworks/src/os-vxworks-coveragetest.h
index aeada46d6..c9e5b1753 100644
--- a/src/unit-test-coverage/vxworks/src/os-vxworks-coveragetest.h
+++ b/src/unit-test-coverage/vxworks/src/os-vxworks-coveragetest.h
@@ -19,10 +19,10 @@
  */
 
 /**
- * \file     os-vxworks-coveragetest.h
- * \ingroup  vxworks
- * \author   joseph.p.hickey@nasa.gov
+ * \file
+ * \ingroup vxworks
  *
+ * Declarations and prototypes for os-vxworks-coveragetest
  */
 
 #ifndef OS_VXWORKS_COVERAGETEST_H
@@ -71,4 +71,4 @@
 void Osapi_Test_Setup(void);
 void Osapi_Test_Teardown(void);
 
-#endif /* OS_VXWORKS_COVERAGETEST_H  */
+#endif /* OS_VXWORKS_COVERAGETEST_H */