diff --git a/src/bsp/generic-linux/src/generic_linux_bsp_internal.h b/src/bsp/generic-linux/src/generic_linux_bsp_internal.h
index 85ab8145e..716c09b50 100644
--- a/src/bsp/generic-linux/src/generic_linux_bsp_internal.h
+++ b/src/bsp/generic-linux/src/generic_linux_bsp_internal.h
@@ -18,15 +18,15 @@
  *  limitations under the License.
  */
 
-/*
- * File:  generic_linux_bsp_internal.h
+/**
+ * \file
  *
  * Purpose:
  *   Header file for internal data to the LINUX BSP
  */
 
-#ifndef GENERIC_LINUX_BSP_INTERNAL_H_
-#define GENERIC_LINUX_BSP_INTERNAL_H_
+#ifndef GENERIC_LINUX_BSP_INTERNAL_H
+#define GENERIC_LINUX_BSP_INTERNAL_H
 
 #include "osapi-common.h"
 #include "osapi-bsp.h"
diff --git a/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h b/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h
index 640603c4a..084c0345e 100644
--- a/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h
+++ b/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h
@@ -18,15 +18,15 @@
  *  limitations under the License.
  */
 
-/*
- * File:  generic_vxworks_bsp_internal.h
+/**
+ * \file
  *
  * Purpose:
  *   Header file for internal data to the VxWorks BSP
  */
 
-#ifndef GENERIC_VXWORKS_BSP_INTERNAL_H_
-#define GENERIC_VXWORKS_BSP_INTERNAL_H_
+#ifndef GENERIC_VXWORKS_BSP_INTERNAL_H
+#define GENERIC_VXWORKS_BSP_INTERNAL_H
 
 /*
 ** OSAL includes
diff --git a/src/bsp/pc-rtems/src/pcrtems_bsp_internal.h b/src/bsp/pc-rtems/src/pcrtems_bsp_internal.h
index 67f7ff1cb..653c62fb6 100644
--- a/src/bsp/pc-rtems/src/pcrtems_bsp_internal.h
+++ b/src/bsp/pc-rtems/src/pcrtems_bsp_internal.h
@@ -18,8 +18,8 @@
  *  limitations under the License.
  */
 
-/*
- * File:  pcrtems_bsp_internal.h
+/**
+ * \file
  *
  * Purpose:
  *   Header file for internal data to the PC-RTEMS BSP
diff --git a/src/bsp/shared/inc/bsp-impl.h b/src/bsp/shared/inc/bsp-impl.h
index 73f2ce4eb..d6d178dc4 100644
--- a/src/bsp/shared/inc/bsp-impl.h
+++ b/src/bsp/shared/inc/bsp-impl.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file   bsp-impl.h
+ * \file
+ *
  * \author joseph.p.hickey@nasa.gov
  *
  * Purpose: Contains functions prototype definitions and variables declarations
diff --git a/src/os/inc/common_types.h b/src/os/inc/common_types.h
index ff5ed718c..c9fb41823 100644
--- a/src/os/inc/common_types.h
+++ b/src/os/inc/common_types.h
@@ -18,8 +18,8 @@
  *  limitations under the License.
  */
 
-/*
- *  Filename: common_types.h
+/**
+ * \file
  *
  *  Purpose:
  *	    Unit specification for common types.
@@ -184,4 +184,4 @@ extern "C"
 #define OSAL_INDEX_C(X)      ((osal_index_t)(X))
 #define OSAL_OBJTYPE_C(X)    ((osal_objtype_t)(X))
 
-#endif /* _common_types_ */
+#endif /* COMMON_TYPES_H */
diff --git a/src/os/inc/osapi-binsem.h b/src/os/inc/osapi-binsem.h
index 4474450bc..21335fc29 100644
--- a/src/os/inc/osapi-binsem.h
+++ b/src/os/inc/osapi-binsem.h
@@ -18,8 +18,10 @@
  *  limitations under the License.
  */
 
-/*
- * File: osapi-binsem.h
+/**
+ * \file
+ *
+ * Declarations and prototypes for binary semaphores
  */
 
 #ifndef OSAPI_BINSEM_H
@@ -200,4 +202,4 @@ int32 OS_BinSemGetInfo(osal_id_t sem_id, OS_bin_sem_prop_t *bin_prop);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_BINSEM_H */
diff --git a/src/os/inc/osapi-bsp.h b/src/os/inc/osapi-bsp.h
index 3fa39d140..4f4c7ee18 100644
--- a/src/os/inc/osapi-bsp.h
+++ b/src/os/inc/osapi-bsp.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-bsp.h
+ * \file
+ *
+ * Declarations and prototypes for OSAL BSP
  */
 
 #ifndef OSAPI_BSP_H
@@ -92,4 +94,4 @@ void OS_BSP_SetExitCode(int32 code);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_BSP_H */
diff --git a/src/os/inc/osapi-clock.h b/src/os/inc/osapi-clock.h
index b2fb0349d..e13d06635 100644
--- a/src/os/inc/osapi-clock.h
+++ b/src/os/inc/osapi-clock.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-clock.h
+ * \file
+ *
+ * Declarations and prototypes for osapi-clock module
  */
 
 #ifndef OSAPI_CLOCK_H
@@ -402,4 +404,4 @@ static inline OS_time_t OS_TimeSubtract(OS_time_t time1, OS_time_t time2)
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_CLOCK_H */
diff --git a/src/os/inc/osapi-common.h b/src/os/inc/osapi-common.h
index ac6b1bcdc..58e76d38b 100644
--- a/src/os/inc/osapi-common.h
+++ b/src/os/inc/osapi-common.h
@@ -18,8 +18,10 @@
  *  limitations under the License.
  */
 
-/*
- * @file osapi-common.h
+/**
+ * \file
+ *
+ * Declarations and prototypes for general OSAL functions that are not part of a subsystem
  */
 
 #ifndef OSAPI_COMMON_H
@@ -210,4 +212,4 @@ int32 OS_RegisterEventHandler(OS_EventHandler_t handler);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_COMMON_H */
diff --git a/src/os/inc/osapi-constants.h b/src/os/inc/osapi-constants.h
index e3aa32f1c..ecd84283b 100644
--- a/src/os/inc/osapi-constants.h
+++ b/src/os/inc/osapi-constants.h
@@ -18,8 +18,10 @@
  *  limitations under the License.
  */
 
-/*
- * @file osapi-constants.h
+/**
+ * \file
+ *
+ * General constants for OSAL that are shared across subsystems
  */
 
 #ifndef OSAPI_CONSTANTS_H
@@ -53,4 +55,4 @@
  */
 #define OS_MAX_LOCAL_PATH_LEN (OS_MAX_PATH_LEN + OS_FS_PHYS_NAME_LEN)
 
-#endif
+#endif /* OSAPI_CONSTANTS_H */
diff --git a/src/os/inc/osapi-countsem.h b/src/os/inc/osapi-countsem.h
index b74cde754..8fd194a6e 100644
--- a/src/os/inc/osapi-countsem.h
+++ b/src/os/inc/osapi-countsem.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-countsem.h
+ * \file
+ *
+ * Declarations and prototypes for counting semaphores
  */
 
 #ifndef OSAPI_COUNTSEM_H
@@ -175,4 +177,4 @@ int32 OS_CountSemGetInfo(osal_id_t sem_id, OS_count_sem_prop_t *count_prop);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_COUNTSEM_H */
diff --git a/src/os/inc/osapi-dir.h b/src/os/inc/osapi-dir.h
index a9c594dcc..452ac7f94 100644
--- a/src/os/inc/osapi-dir.h
+++ b/src/os/inc/osapi-dir.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-dir.h
+ * \file
+ *
+ * Declarations and prototypes for directories
  */
 
 #ifndef OSAPI_DIR_H
@@ -136,4 +138,4 @@ int32 OS_mkdir(const char *path, uint32 access);
 int32 OS_rmdir(const char *path);
 /**@}*/
 
-#endif
+#endif /* OSAPI_DIR_H */
diff --git a/src/os/inc/osapi-error.h b/src/os/inc/osapi-error.h
index c0af8e57e..30b17caee 100644
--- a/src/os/inc/osapi-error.h
+++ b/src/os/inc/osapi-error.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-error.h
+ * \file
+ *
+ * OSAL error code definitions
  */
 
 #ifndef OSAPI_ERROR_H
@@ -117,4 +119,4 @@ typedef char os_err_name_t[OS_ERROR_NAME_LENGTH];
 int32 OS_GetErrorName(int32 error_num, os_err_name_t *err_name);
 /**@}*/
 
-#endif
+#endif /* OSAPI_ERROR_H */
diff --git a/src/os/inc/osapi-file.h b/src/os/inc/osapi-file.h
index 413515876..267c24b2d 100644
--- a/src/os/inc/osapi-file.h
+++ b/src/os/inc/osapi-file.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-file.h
+ * \file
+ *
+ * Declarations and prototypes for file objects
  */
 
 #ifndef OSAPI_FILE_H
@@ -461,4 +463,4 @@ int32 OS_CloseAllFiles(void);
 int32 OS_CloseFileByName(const char *Filename);
 /**@}*/
 
-#endif
+#endif /* OSAPI_FILE_H */
diff --git a/src/os/inc/osapi-filesys.h b/src/os/inc/osapi-filesys.h
index b8fc9f30a..c9d0d567b 100644
--- a/src/os/inc/osapi-filesys.h
+++ b/src/os/inc/osapi-filesys.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-filesys.h
+ * \file
+ *
+ * Declarations and prototypes for file systems
  */
 
 #ifndef OSAPI_FILESYS_H
@@ -77,7 +79,6 @@ typedef struct
  *
  *      OS_FileSysAddFixedMap(&fs_id, "/", "/root");
  *
- *
  * @param[out]  filesys_id  A non-zero OSAL ID reflecting the file system
  * @param[in]   phys_path   The native system directory (an existing mount point)
  * @param[in]   virt_path   The virtual mount point of this filesystem
@@ -279,4 +280,4 @@ int32 OS_TranslatePath(const char *VirtualPath, char *LocalPath);
 int32 OS_GetFsInfo(os_fsinfo_t *filesys_info);
 /**@}*/
 
-#endif
+#endif /* OSAPI_FILESYS_H */
diff --git a/src/os/inc/osapi-heap.h b/src/os/inc/osapi-heap.h
index 5bdd32973..690b95e82 100644
--- a/src/os/inc/osapi-heap.h
+++ b/src/os/inc/osapi-heap.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-heap.h
+ * \file
+ *
+ * Declarations and prototypes for heap functions
  */
 
 #ifndef OSAPI_HEAP_H
@@ -55,4 +57,4 @@ typedef struct
 int32 OS_HeapGetInfo(OS_heap_prop_t *heap_prop);
 /**@}*/
 
-#endif
+#endif /* OSAPI_HEAP_H */
diff --git a/src/os/inc/osapi-idmap.h b/src/os/inc/osapi-idmap.h
index cd93b0f3e..345446227 100644
--- a/src/os/inc/osapi-idmap.h
+++ b/src/os/inc/osapi-idmap.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-idmap.h
+ * \file
+ *
+ * Declarations and prototypes for object IDs
  */
 
 #ifndef OSAPI_IDMAP_H
@@ -261,4 +263,4 @@ void OS_ForEachObjectOfType(osal_objtype_t objtype, osal_id_t creator_id, OS_Arg
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_IDMAP_H */
diff --git a/src/os/inc/osapi-macros.h b/src/os/inc/osapi-macros.h
index 120499a51..594ddee7f 100644
--- a/src/os/inc/osapi-macros.h
+++ b/src/os/inc/osapi-macros.h
@@ -18,8 +18,10 @@
  *  limitations under the License.
  */
 
-/*
- * @file osapi-macros.h
+/**
+ * \file
+ *
+ * Macro definitions that are used across all OSAL subsystems
  */
 
 #ifndef OSAPI_MACROS_H
@@ -136,4 +138,4 @@
  */
 #define LENGTHCHECK(str, len, errcode) ARGCHECK(memchr(str, '\0', len), errcode)
 
-#endif
+#endif /* OSAPI_MACROS_H */
diff --git a/src/os/inc/osapi-module.h b/src/os/inc/osapi-module.h
index d6f60fde6..634b981b2 100644
--- a/src/os/inc/osapi-module.h
+++ b/src/os/inc/osapi-module.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-module.h
+ * \file
+ *
+ * Declarations and prototypes for module subsystem
  */
 
 #ifndef OSAPI_MODULE_H
@@ -231,4 +233,4 @@ int32 OS_ModuleUnload(osal_id_t module_id);
 int32 OS_ModuleInfo(osal_id_t module_id, OS_module_prop_t *module_info);
 /**@}*/
 
-#endif
+#endif /* OSAPI_MODULE_H */
diff --git a/src/os/inc/osapi-mutex.h b/src/os/inc/osapi-mutex.h
index d7ba1664c..b7be53b42 100644
--- a/src/os/inc/osapi-mutex.h
+++ b/src/os/inc/osapi-mutex.h
@@ -18,8 +18,10 @@
  *  limitations under the License.
  */
 
-/*
- * File: osapi-mutex.h
+/**
+ * \file
+ *
+ * Declarations and prototypes for mutexes
  */
 
 #ifndef OSAPI_MUTEX_H
@@ -149,4 +151,4 @@ int32 OS_MutSemGetIdByName(osal_id_t *sem_id, const char *sem_name);
 int32 OS_MutSemGetInfo(osal_id_t sem_id, OS_mut_sem_prop_t *mut_prop);
 /**@}*/
 
-#endif
+#endif /* OSAPI_MUTEX_H */
diff --git a/src/os/inc/osapi-network.h b/src/os/inc/osapi-network.h
index 391492249..bce88e364 100644
--- a/src/os/inc/osapi-network.h
+++ b/src/os/inc/osapi-network.h
@@ -18,8 +18,10 @@
  *  limitations under the License.
  */
 
-/*
- * @file osapi-network.h
+/**
+ * \file
+ *
+ * Declarations and prototypes for network subsystem
  */
 
 #ifndef OSAPI_NETWORK_H
@@ -68,4 +70,4 @@ int32 OS_NetworkGetHostName(char *host_name, size_t name_len);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_NETWORK_H */
diff --git a/src/os/inc/osapi-printf.h b/src/os/inc/osapi-printf.h
index 6e072419b..75fc7983e 100644
--- a/src/os/inc/osapi-printf.h
+++ b/src/os/inc/osapi-printf.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-printf.h
+ * \file
+ *
+ * Declarations and prototypes for printf/console output
  */
 
 #ifndef OSAPI_PRINTF_H
@@ -68,4 +70,4 @@ void OS_printf_disable(void);
 void OS_printf_enable(void);
 /**@}*/
 
-#endif
+#endif /* OSAPI_PRINTF_H */
diff --git a/src/os/inc/osapi-queue.h b/src/os/inc/osapi-queue.h
index 3bc5a877a..69a9222dc 100644
--- a/src/os/inc/osapi-queue.h
+++ b/src/os/inc/osapi-queue.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-queue.h
+ * \file
+ *
+ * Declarations and prototypes for queue subsystem
  */
 
 #ifndef OSAPI_QUEUE_H
@@ -48,7 +50,6 @@ typedef struct
  * the queue. Queue names must be unique; if the name already exists this
  * function fails. Names cannot be NULL.
  *
- *
  * @param[out]  queue_id will be set to the non-zero ID of the newly-created resource
  * @param[in]   queue_name the name of the new resource to create
  * @param[in]   queue_depth the maximum depth of the queue
@@ -163,4 +164,4 @@ int32 OS_QueueGetIdByName(osal_id_t *queue_id, const char *queue_name);
 int32 OS_QueueGetInfo(osal_id_t queue_id, OS_queue_prop_t *queue_prop);
 /**@}*/
 
-#endif
+#endif /* OSAPI_QUEUE_H */
diff --git a/src/os/inc/osapi-select.h b/src/os/inc/osapi-select.h
index fefc18cd0..004b0a4af 100644
--- a/src/os/inc/osapi-select.h
+++ b/src/os/inc/osapi-select.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-select.h
+ * \file
+ *
+ * Declarations and prototypes for select abstraction
  */
 
 #ifndef OSAPI_SELECT_H
@@ -154,4 +156,4 @@ int32 OS_SelectFdClear(OS_FdSet *Set, osal_id_t objid);
 bool OS_SelectFdIsSet(OS_FdSet *Set, osal_id_t objid);
 /**@}*/
 
-#endif
+#endif /* OSAPI_SELECT_H */
diff --git a/src/os/inc/osapi-shell.h b/src/os/inc/osapi-shell.h
index 914f0775f..c51169efd 100644
--- a/src/os/inc/osapi-shell.h
+++ b/src/os/inc/osapi-shell.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-shell.h
+ * \file
+ *
+ * Declarations and prototypes for shell abstraction
  */
 
 #ifndef OSAPI_SHELL_H
@@ -51,4 +53,4 @@ int32 OS_ShellOutputToFile(const char *Cmd, osal_id_t filedes);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_SHELL_H */
diff --git a/src/os/inc/osapi-sockets.h b/src/os/inc/osapi-sockets.h
index 92c5f567c..09e3b5a75 100644
--- a/src/os/inc/osapi-sockets.h
+++ b/src/os/inc/osapi-sockets.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-sockets.h
+ * \file
+ *
+ * Declarations and prototypes for sockets abstraction
  */
 
 #ifndef OSAPI_SOCKETS_H
@@ -370,4 +372,4 @@ int32 OS_SocketGetInfo(osal_id_t sock_id, OS_socket_prop_t *sock_prop);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_SOCKETS_H */
diff --git a/src/os/inc/osapi-task.h b/src/os/inc/osapi-task.h
index acc7e1304..56363479d 100644
--- a/src/os/inc/osapi-task.h
+++ b/src/os/inc/osapi-task.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-task.h
+ * \file
+ *
+ * Declarations and prototypes for task abstraction
  */
 
 #ifndef OSAPI_TASK_H
@@ -248,4 +250,4 @@ int32 OS_TaskFindIdBySystemData(osal_id_t *task_id, const void *sysdata, size_t
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_TASK_H */
diff --git a/src/os/inc/osapi-timebase.h b/src/os/inc/osapi-timebase.h
index 1e709ee2b..3d2dd74a6 100644
--- a/src/os/inc/osapi-timebase.h
+++ b/src/os/inc/osapi-timebase.h
@@ -18,8 +18,10 @@
  *  limitations under the License.
  */
 
-/*
- * @file osapi-timebase.h
+/**
+ * \file
+ *
+ * Declarations and prototypes for timebase abstraction
  */
 
 #ifndef OSAPI_TIMEBASE_H
@@ -185,4 +187,4 @@ int32 OS_TimeBaseGetFreeRun(osal_id_t timebase_id, uint32 *freerun_val);
 
 /**@}*/
 
-#endif
+#endif /* OSAPI_TIMEBASE_H */
diff --git a/src/os/inc/osapi-timer.h b/src/os/inc/osapi-timer.h
index 785364eb4..eaf9148d6 100644
--- a/src/os/inc/osapi-timer.h
+++ b/src/os/inc/osapi-timer.h
@@ -19,7 +19,9 @@
  */
 
 /**
- * @file osapi-timer.h
+ * \file
+ *
+ * Declarations and prototypes for timer abstraction (app callbacks)
  */
 
 #ifndef OSAPI_TIMER_H
@@ -208,4 +210,4 @@ int32 OS_TimerGetIdByName(osal_id_t *timer_id, const char *timer_name);
 int32 OS_TimerGetInfo(osal_id_t timer_id, OS_timer_prop_t *timer_prop);
 /**@}*/
 
-#endif
+#endif /* OSAPI_TIMER_H */
diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
index 89b2df060..4f8ea5728 100644
--- a/src/os/inc/osapi-version.h
+++ b/src/os/inc/osapi-version.h
@@ -18,12 +18,14 @@
  *  limitations under the License.
  */
 
-/*! @file osapi-version.h
- * @brief Purpose:
- *  @details Provide version identifiers for cFS' Operating System Abstraction Layer
+/**
+ * \file
+ *
+ * Provide version identifiers for cFS' Operating System Abstraction Layer
  *  See @ref cfsversions for version and build number and description
  *
  */
+
 #ifndef OSAPI_VERSION_H
 #define OSAPI_VERSION_H
 
@@ -151,7 +153,3 @@ void OS_GetVersionNumber(uint8 VersionNumbers[4]);
 uint32 OS_GetBuildNumber(void);
 
 #endif /* OSAPI_VERSION_H */
-
-/************************/
-/*  End of File Comment */
-/************************/
diff --git a/src/os/inc/osapi.h b/src/os/inc/osapi.h
index 11701501a..01a548992 100644
--- a/src/os/inc/osapi.h
+++ b/src/os/inc/osapi.h
@@ -18,8 +18,8 @@
  *  limitations under the License.
  */
 
-/*
- * File: osapi.h
+/**
+ * \file
  *
  * Author:  Alan Cudmore - Code 582
  *
@@ -102,4 +102,4 @@ extern "C"
 }
 #endif
 
-#endif
+#endif /* OSAPI_H */
diff --git a/src/os/posix/inc/os-impl-binsem.h b/src/os/posix/inc/os-impl-binsem.h
index 356ec8e94..c02dc6a90 100644
--- a/src/os/posix/inc/os-impl-binsem.h
+++ b/src/os/posix/inc/os-impl-binsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-binsem.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -44,4 +45,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_binsem_internal_record_t OS_impl_bin_sem_table[OS_MAX_BIN_SEMAPHORES];
 
-#endif /* OS_IMPL_BINSEM_H  */
+#endif /* OS_IMPL_BINSEM_H */
diff --git a/src/os/posix/inc/os-impl-console.h b/src/os/posix/inc/os-impl-console.h
index 3ed7ac81f..4fdbc66da 100644
--- a/src/os/posix/inc/os-impl-console.h
+++ b/src/os/posix/inc/os-impl-console.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-console.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -42,4 +43,4 @@ typedef struct
 
 extern OS_impl_console_internal_record_t OS_impl_console_table[OS_MAX_CONSOLES];
 
-#endif /* OS_IMPL_CONSOLE_H  */
+#endif /* OS_IMPL_CONSOLE_H */
diff --git a/src/os/posix/inc/os-impl-countsem.h b/src/os/posix/inc/os-impl-countsem.h
index 176fcd9ec..d131c27e7 100644
--- a/src/os/posix/inc/os-impl-countsem.h
+++ b/src/os/posix/inc/os-impl-countsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-countsem.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_countsem_internal_record_t OS_impl_count_sem_table[OS_MAX_COUNT_SEMAPHORES];
 
-#endif /* OS_IMPL_COUNTSEM_H  */
+#endif /* OS_IMPL_COUNTSEM_H */
diff --git a/src/os/posix/inc/os-impl-dirs.h b/src/os/posix/inc/os-impl-dirs.h
index e10b8e185..e885a3c6d 100644
--- a/src/os/posix/inc/os-impl-dirs.h
+++ b/src/os/posix/inc/os-impl-dirs.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-dirs.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -45,4 +46,4 @@ typedef struct
  */
 extern OS_impl_dir_internal_record_t OS_impl_dir_table[OS_MAX_NUM_OPEN_DIRS];
 
-#endif /* OS_IMPL_DIRS_H  */
+#endif /* OS_IMPL_DIRS_H */
diff --git a/src/os/posix/inc/os-impl-files.h b/src/os/posix/inc/os-impl-files.h
index ec9f1e01c..46c2381cc 100644
--- a/src/os/posix/inc/os-impl-files.h
+++ b/src/os/posix/inc/os-impl-files.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-files.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -48,4 +49,4 @@ extern gid_t OS_IMPL_SELF_EGID;
 
 extern const int OS_IMPL_REGULAR_FILE_FLAGS;
 
-#endif /* OS_IMPL_FILES_H  */
+#endif /* OS_IMPL_FILES_H */
diff --git a/src/os/posix/inc/os-impl-gettime.h b/src/os/posix/inc/os-impl-gettime.h
index c48d6f324..e590ba319 100644
--- a/src/os/posix/inc/os-impl-gettime.h
+++ b/src/os/posix/inc/os-impl-gettime.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-gettime.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -33,4 +34,4 @@
 
 #define OSAL_GETTIME_SOURCE_CLOCK CLOCK_MONOTONIC
 
-#endif /* OS_IMPL_GETTIME_H  */
+#endif /* OS_IMPL_GETTIME_H */
diff --git a/src/os/posix/inc/os-impl-idmap.h b/src/os/posix/inc/os-impl-idmap.h
index 00194e1ac..5a3807e0d 100644
--- a/src/os/posix/inc/os-impl-idmap.h
+++ b/src/os/posix/inc/os-impl-idmap.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-idmap.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -41,4 +42,4 @@ typedef struct
 /* Tables where the lock state information is stored */
 extern OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER];
 
-#endif /* OS_IMPL_IDMAP_H  */
+#endif /* OS_IMPL_IDMAP_H */
diff --git a/src/os/posix/inc/os-impl-io.h b/src/os/posix/inc/os-impl-io.h
index 9db8e7c81..c9131381f 100644
--- a/src/os/posix/inc/os-impl-io.h
+++ b/src/os/posix/inc/os-impl-io.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-io.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -48,4 +49,4 @@ typedef struct
  */
 extern OS_impl_file_internal_record_t OS_impl_filehandle_table[OS_MAX_NUM_OPEN_FILES];
 
-#endif /* OS_IMPL_IO_H  */
+#endif /* OS_IMPL_IO_H */
diff --git a/src/os/posix/inc/os-impl-loader.h b/src/os/posix/inc/os-impl-loader.h
index b7dc4b641..51ec457d1 100644
--- a/src/os/posix/inc/os-impl-loader.h
+++ b/src/os/posix/inc/os-impl-loader.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-loader.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -52,4 +53,4 @@ typedef struct
  */
 extern OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES];
 
-#endif /* OS_IMPL_LOADER_H  */
+#endif /* OS_IMPL_LOADER_H */
diff --git a/src/os/posix/inc/os-impl-mutex.h b/src/os/posix/inc/os-impl-mutex.h
index 61db43dbf..394436841 100644
--- a/src/os/posix/inc/os-impl-mutex.h
+++ b/src/os/posix/inc/os-impl-mutex.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-mutex.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -40,4 +41,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_mutex_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES];
 
-#endif /* OS_IMPL_MUTEX_H  */
+#endif /* OS_IMPL_MUTEX_H */
diff --git a/src/os/posix/inc/os-impl-network.h b/src/os/posix/inc/os-impl-network.h
index 977f978d6..716141d77 100644
--- a/src/os/posix/inc/os-impl-network.h
+++ b/src/os/posix/inc/os-impl-network.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-network.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -30,4 +31,4 @@
 
 #include <unistd.h>
 
-#endif /* OS_IMPL_NETWORK_H  */
+#endif /* OS_IMPL_NETWORK_H */
diff --git a/src/os/posix/inc/os-impl-queues.h b/src/os/posix/inc/os-impl-queues.h
index 673b6a0a0..decfe3e25 100644
--- a/src/os/posix/inc/os-impl-queues.h
+++ b/src/os/posix/inc/os-impl-queues.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-queues.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -40,4 +41,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_queue_internal_record_t OS_impl_queue_table[OS_MAX_QUEUES];
 
-#endif /* OS_IMPL_QUEUES_H  */
+#endif /* OS_IMPL_QUEUES_H */
diff --git a/src/os/posix/inc/os-impl-select.h b/src/os/posix/inc/os-impl-select.h
index bdcdc9ba0..264ce2c0b 100644
--- a/src/os/posix/inc/os-impl-select.h
+++ b/src/os/posix/inc/os-impl-select.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-select.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -33,4 +34,4 @@
 #include <sys/select.h>
 #include <sys/time.h>
 
-#endif /* OS_IMPL_SELECT_H  */
+#endif /* OS_IMPL_SELECT_H */
diff --git a/src/os/posix/inc/os-impl-sockets.h b/src/os/posix/inc/os-impl-sockets.h
index 217253246..3860515d4 100644
--- a/src/os/posix/inc/os-impl-sockets.h
+++ b/src/os/posix/inc/os-impl-sockets.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-sockets.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -43,4 +44,4 @@
  */
 #define OS_IMPL_SOCKET_FLAGS O_NONBLOCK
 
-#endif /* OS_IMPL_SOCKETS_H  */
+#endif /* OS_IMPL_SOCKETS_H */
diff --git a/src/os/posix/inc/os-impl-tasks.h b/src/os/posix/inc/os-impl-tasks.h
index 879baed6c..7669f8804 100644
--- a/src/os/posix/inc/os-impl-tasks.h
+++ b/src/os/posix/inc/os-impl-tasks.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-tasks.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -45,4 +46,4 @@ extern OS_impl_task_internal_record_t OS_impl_task_table[OS_MAX_TASKS];
 int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority, size_t stacksz,
                                        PthreadFuncPtr_t entry, void *entry_arg);
 
-#endif /* OS_IMPL_TASKS_H  */
+#endif /* OS_IMPL_TASKS_H */
diff --git a/src/os/posix/inc/os-impl-timebase.h b/src/os/posix/inc/os-impl-timebase.h
index a995f4b8b..7a0afbec4 100644
--- a/src/os/posix/inc/os-impl-timebase.h
+++ b/src/os/posix/inc/os-impl-timebase.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-timebase.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -50,4 +51,4 @@ typedef struct
 
 extern OS_impl_timebase_internal_record_t OS_impl_timebase_table[OS_MAX_TIMEBASES];
 
-#endif /* OS_IMPL_TIMEBASE_H  */
+#endif /* OS_IMPL_TIMEBASE_H */
diff --git a/src/os/posix/inc/os-posix.h b/src/os/posix/inc/os-posix.h
index 33105f97d..c17dfca2f 100644
--- a/src/os/posix/inc/os-posix.h
+++ b/src/os/posix/inc/os-posix.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-posix.h
+ * \file
+ *
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -34,7 +35,6 @@
 /****************************************************************************************
                                     COMMON INCLUDE FILES
  ***************************************************************************************/
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -109,4 +109,4 @@ int32 OS_Posix_TableMutex_Init(osal_objtype_t idtype);
 
 void OS_Posix_CompAbsDelayTime(uint32 msecs, struct timespec *tm);
 
-#endif /* OS_POSIX_H  */
+#endif /* OS_POSIX_H */
diff --git a/src/os/rtems/inc/os-impl-binsem.h b/src/os/rtems/inc/os-impl-binsem.h
index 7437e6c5b..068d97915 100644
--- a/src/os/rtems/inc/os-impl-binsem.h
+++ b/src/os/rtems/inc/os-impl-binsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-binsem.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_binsem_internal_record_t OS_impl_bin_sem_table[OS_MAX_BIN_SEMAPHORES];
 
-#endif /* OS_IMPL_BINSEM_H  */
+#endif /* OS_IMPL_BINSEM_H */
diff --git a/src/os/rtems/inc/os-impl-console.h b/src/os/rtems/inc/os-impl-console.h
index 03663aad9..71bf7d78f 100644
--- a/src/os/rtems/inc/os-impl-console.h
+++ b/src/os/rtems/inc/os-impl-console.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-console.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -42,4 +43,4 @@ typedef struct
 
 extern OS_impl_console_internal_record_t OS_impl_console_table[OS_MAX_CONSOLES];
 
-#endif /* OS_IMPL_CONSOLE_H  */
+#endif /* OS_IMPL_CONSOLE_H */
diff --git a/src/os/rtems/inc/os-impl-countsem.h b/src/os/rtems/inc/os-impl-countsem.h
index 5070ee6db..9dcccf7b9 100644
--- a/src/os/rtems/inc/os-impl-countsem.h
+++ b/src/os/rtems/inc/os-impl-countsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-countsem.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_countsem_internal_record_t OS_impl_count_sem_table[OS_MAX_COUNT_SEMAPHORES];
 
-#endif /* OS_IMPL_COUNTSEM_H  */
+#endif /* OS_IMPL_COUNTSEM_H */
diff --git a/src/os/rtems/inc/os-impl-dirs.h b/src/os/rtems/inc/os-impl-dirs.h
index 8db0eee60..bf56a3e17 100644
--- a/src/os/rtems/inc/os-impl-dirs.h
+++ b/src/os/rtems/inc/os-impl-dirs.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-dirs.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -45,4 +46,4 @@ typedef struct
  */
 extern OS_impl_dir_internal_record_t OS_impl_dir_table[OS_MAX_NUM_OPEN_DIRS];
 
-#endif /* OS_IMPL_DIRS_H  */
+#endif /* OS_IMPL_DIRS_H */
diff --git a/src/os/rtems/inc/os-impl-files.h b/src/os/rtems/inc/os-impl-files.h
index c15b915b6..8b1fa7cef 100644
--- a/src/os/rtems/inc/os-impl-files.h
+++ b/src/os/rtems/inc/os-impl-files.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-files.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -42,4 +43,4 @@
 
 #define OS_IMPL_REGULAR_FILE_FLAGS 0
 
-#endif /* OS_IMPL_FILES_H  */
+#endif /* OS_IMPL_FILES_H */
diff --git a/src/os/rtems/inc/os-impl-gettime.h b/src/os/rtems/inc/os-impl-gettime.h
index 28690e350..1b9750175 100644
--- a/src/os/rtems/inc/os-impl-gettime.h
+++ b/src/os/rtems/inc/os-impl-gettime.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-gettime.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -33,4 +34,4 @@
 
 #define OSAL_GETTIME_SOURCE_CLOCK CLOCK_MONOTONIC
 
-#endif /* OS_IMPL_GETTIME_H  */
+#endif /* OS_IMPL_GETTIME_H */
diff --git a/src/os/rtems/inc/os-impl-idmap.h b/src/os/rtems/inc/os-impl-idmap.h
index 1f0285192..738d54fdd 100644
--- a/src/os/rtems/inc/os-impl-idmap.h
+++ b/src/os/rtems/inc/os-impl-idmap.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-idmap.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -40,4 +41,4 @@ typedef struct
 /* Tables where the lock state information is stored */
 extern OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER];
 
-#endif /* OS_IMPL_IDMAP_H  */
+#endif /* OS_IMPL_IDMAP_H */
diff --git a/src/os/rtems/inc/os-impl-io.h b/src/os/rtems/inc/os-impl-io.h
index da6432214..481ff22c9 100644
--- a/src/os/rtems/inc/os-impl-io.h
+++ b/src/os/rtems/inc/os-impl-io.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-io.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -46,4 +47,4 @@ typedef struct
  */
 extern OS_impl_file_internal_record_t OS_impl_filehandle_table[OS_MAX_NUM_OPEN_FILES];
 
-#endif /* OS_IMPL_IO_H  */
+#endif /* OS_IMPL_IO_H */
diff --git a/src/os/rtems/inc/os-impl-loader.h b/src/os/rtems/inc/os-impl-loader.h
index 12503c023..24c6cc65b 100644
--- a/src/os/rtems/inc/os-impl-loader.h
+++ b/src/os/rtems/inc/os-impl-loader.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-loader.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -50,4 +51,4 @@ typedef struct
 
 extern OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES];
 
-#endif /* OS_IMPL_LOADER_H  */
+#endif /* OS_IMPL_LOADER_H */
diff --git a/src/os/rtems/inc/os-impl-mutex.h b/src/os/rtems/inc/os-impl-mutex.h
index be17d462a..a76c7e78f 100644
--- a/src/os/rtems/inc/os-impl-mutex.h
+++ b/src/os/rtems/inc/os-impl-mutex.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-mutex.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_mutex_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES];
 
-#endif /* OS_IMPL_MUTEX_H  */
+#endif /* OS_IMPL_MUTEX_H */
diff --git a/src/os/rtems/inc/os-impl-queues.h b/src/os/rtems/inc/os-impl-queues.h
index 354abec24..5d9de4973 100644
--- a/src/os/rtems/inc/os-impl-queues.h
+++ b/src/os/rtems/inc/os-impl-queues.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-queues.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_queue_internal_record_t OS_impl_queue_table[OS_MAX_QUEUES];
 
-#endif /* OS_IMPL_QUEUES_H  */
+#endif /* OS_IMPL_QUEUES_H */
diff --git a/src/os/rtems/inc/os-impl-select.h b/src/os/rtems/inc/os-impl-select.h
index 4e6164365..0c9b13226 100644
--- a/src/os/rtems/inc/os-impl-select.h
+++ b/src/os/rtems/inc/os-impl-select.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-select.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -33,4 +34,4 @@
 #include <sys/select.h>
 #include <sys/time.h>
 
-#endif /* OS_IMPL_SELECT_H  */
+#endif /* OS_IMPL_SELECT_H */
diff --git a/src/os/rtems/inc/os-impl-sockets.h b/src/os/rtems/inc/os-impl-sockets.h
index a1e557801..c2c88bcd3 100644
--- a/src/os/rtems/inc/os-impl-sockets.h
+++ b/src/os/rtems/inc/os-impl-sockets.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-sockets.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -43,4 +44,4 @@
  */
 #define OS_IMPL_SOCKET_FLAGS O_NONBLOCK
 
-#endif /* OS_IMPL_SOCKETS_H  */
+#endif /* OS_IMPL_SOCKETS_H */
diff --git a/src/os/rtems/inc/os-impl-tasks.h b/src/os/rtems/inc/os-impl-tasks.h
index d8fb5dd47..ae870dae6 100644
--- a/src/os/rtems/inc/os-impl-tasks.h
+++ b/src/os/rtems/inc/os-impl-tasks.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-tasks.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_task_internal_record_t OS_impl_task_table[OS_MAX_TASKS];
 
-#endif /* OS_IMPL_TASKS_H  */
+#endif /* OS_IMPL_TASKS_H */
diff --git a/src/os/rtems/inc/os-impl-timebase.h b/src/os/rtems/inc/os-impl-timebase.h
index 998d6354f..07518a641 100644
--- a/src/os/rtems/inc/os-impl-timebase.h
+++ b/src/os/rtems/inc/os-impl-timebase.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-timebase.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -50,4 +51,4 @@ typedef struct
 
 extern OS_impl_timebase_internal_record_t OS_impl_timebase_table[OS_MAX_TIMEBASES];
 
-#endif /* OS_IMPL_TIMEBASE_H  */
+#endif /* OS_IMPL_TIMEBASE_H */
diff --git a/src/os/rtems/inc/os-rtems.h b/src/os/rtems/inc/os-rtems.h
index 4b9a9d2a4..14b326ca3 100644
--- a/src/os/rtems/inc/os-rtems.h
+++ b/src/os/rtems/inc/os-rtems.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-rtems.h
+ * \file
+ *
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -100,4 +101,4 @@ int32 OS_Rtems_FileSysAPI_Impl_Init(void);
 
 int32 OS_Rtems_TableMutex_Init(osal_objtype_t idtype);
 
-#endif /* OS_RTEMS_H  */
+#endif /* OS_RTEMS_H */
diff --git a/src/os/shared/inc/os-shared-binsem.h b/src/os/shared/inc/os-shared-binsem.h
index 9ae72ba85..9a144d74e 100644
--- a/src/os/shared/inc/os-shared-binsem.h
+++ b/src/os/shared/inc/os-shared-binsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-binsem.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -122,4 +123,4 @@ int32 OS_BinSemDelete_Impl(const OS_object_token_t *token);
  ------------------------------------------------------------------*/
 int32 OS_BinSemGetInfo_Impl(const OS_object_token_t *token, OS_bin_sem_prop_t *bin_prop);
 
-#endif /* OS_SHARED_BINSEM_H  */
+#endif /* OS_SHARED_BINSEM_H */
diff --git a/src/os/shared/inc/os-shared-clock.h b/src/os/shared/inc/os-shared-clock.h
index 9619f9bf1..680ed1292 100644
--- a/src/os/shared/inc/os-shared-clock.h
+++ b/src/os/shared/inc/os-shared-clock.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-clock.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -54,4 +55,4 @@ int32 OS_GetLocalTime_Impl(OS_time_t *time_struct);
  ------------------------------------------------------------------*/
 int32 OS_SetLocalTime_Impl(const OS_time_t *time_struct);
 
-#endif /* OS_SHARED_CLOCK_H  */
+#endif /* OS_SHARED_CLOCK_H */
diff --git a/src/os/shared/inc/os-shared-common.h b/src/os/shared/inc/os-shared-common.h
index 32927226f..a7ef1f353 100644
--- a/src/os/shared/inc/os-shared-common.h
+++ b/src/os/shared/inc/os-shared-common.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-common.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -151,4 +152,4 @@ static inline size_t OS_strnlen(const char *s, size_t maxlen)
     return maxlen;
 }
 
-#endif /* OS_SHARED_COMMON_H  */
+#endif /* OS_SHARED_COMMON_H */
diff --git a/src/os/shared/inc/os-shared-countsem.h b/src/os/shared/inc/os-shared-countsem.h
index 67099b5bb..293971c33 100644
--- a/src/os/shared/inc/os-shared-countsem.h
+++ b/src/os/shared/inc/os-shared-countsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-countsem.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -112,4 +113,4 @@ int32 OS_CountSemDelete_Impl(const OS_object_token_t *token);
  ------------------------------------------------------------------*/
 int32 OS_CountSemGetInfo_Impl(const OS_object_token_t *token, OS_count_sem_prop_t *count_prop);
 
-#endif /* OS_SHARED_COUNTSEM_H  */
+#endif /* OS_SHARED_COUNTSEM_H */
diff --git a/src/os/shared/inc/os-shared-dir.h b/src/os/shared/inc/os-shared-dir.h
index 52bc5da22..52eb3b0a1 100644
--- a/src/os/shared/inc/os-shared-dir.h
+++ b/src/os/shared/inc/os-shared-dir.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-dir.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -111,4 +112,4 @@ int32 OS_DirRewind_Impl(const OS_object_token_t *token);
  ------------------------------------------------------------------*/
 int32 OS_DirRemove_Impl(const char *local_path);
 
-#endif /* OS_SHARED_DIR_H  */
+#endif /* OS_SHARED_DIR_H */
diff --git a/src/os/shared/inc/os-shared-errors.h b/src/os/shared/inc/os-shared-errors.h
index 59cf8d21a..f4e2e71f0 100644
--- a/src/os/shared/inc/os-shared-errors.h
+++ b/src/os/shared/inc/os-shared-errors.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-errors.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 
 extern const OS_ErrorTable_Entry_t OS_IMPL_ERROR_NAME_TABLE[];
 
-#endif /* OS_SHARED_ERRORS_H  */
+#endif /* OS_SHARED_ERRORS_H */
diff --git a/src/os/shared/inc/os-shared-file.h b/src/os/shared/inc/os-shared-file.h
index a3177f2d1..ef957ec04 100644
--- a/src/os/shared/inc/os-shared-file.h
+++ b/src/os/shared/inc/os-shared-file.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-file.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -191,4 +192,4 @@ int32 OS_FileChmod_Impl(const char *local_path, uint32 access);
  */
 int32 OS_FileIteratorClose(osal_id_t filedes, void *arg);
 
-#endif /* OS_SHARED_FILE_H  */
+#endif /* OS_SHARED_FILE_H */
diff --git a/src/os/shared/inc/os-shared-filesys.h b/src/os/shared/inc/os-shared-filesys.h
index 52e3c7467..ecd90239d 100644
--- a/src/os/shared/inc/os-shared-filesys.h
+++ b/src/os/shared/inc/os-shared-filesys.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-filesys.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -192,4 +193,4 @@ int32 OS_FileSys_Initialize(char *address, const char *fsdevname, const char *fs
                             osal_blockcount_t numblocks, bool should_format);
 bool  OS_FileSysFilterFree(void *ref, const OS_object_token_t *token, const OS_common_record_t *obj);
 
-#endif /* OS_SHARED_FILESYS_H  */
+#endif /* OS_SHARED_FILESYS_H */
diff --git a/src/os/shared/inc/os-shared-globaldefs.h b/src/os/shared/inc/os-shared-globaldefs.h
index 0f604c8e3..53b238af5 100644
--- a/src/os/shared/inc/os-shared-globaldefs.h
+++ b/src/os/shared/inc/os-shared-globaldefs.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-globaldefs.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -28,8 +29,8 @@
  * so they are put into a common header file.
  */
 
-#ifndef OSAPI_SHARED_GLOBALDEFS_H_
-#define OSAPI_SHARED_GLOBALDEFS_H_
+#ifndef OS_SHARED_GLOBALDEFS_H
+#define OS_SHARED_GLOBALDEFS_H
 
 /* All subsystems reference the same config, common types, and other constants */
 #include "osconfig.h"
@@ -148,4 +149,4 @@ extern void OS_DebugPrintf(uint32 Level, const char *Func, uint32 Line, const ch
  */
 #define OS_CHECK_PATHNAME(str) OS_CHECK_STRING(str, OS_MAX_PATH_LEN, OS_FS_ERR_PATH_TOO_LONG)
 
-#endif /* OS_SHARED_GLOBALDEFS_H  */
+#endif /* OS_SHARED_GLOBALDEFS_H */
diff --git a/src/os/shared/inc/os-shared-heap.h b/src/os/shared/inc/os-shared-heap.h
index 72b786636..4882cbb07 100644
--- a/src/os/shared/inc/os-shared-heap.h
+++ b/src/os/shared/inc/os-shared-heap.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-heap.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -48,4 +49,4 @@
  ------------------------------------------------------------------*/
 int32 OS_HeapGetInfo_Impl(OS_heap_prop_t *heap_prop);
 
-#endif /* OS_SHARED_HEAP_H  */
+#endif /* OS_SHARED_HEAP_H */
diff --git a/src/os/shared/inc/os-shared-idmap.h b/src/os/shared/inc/os-shared-idmap.h
index ae798ff9b..820baa67b 100644
--- a/src/os/shared/inc/os-shared-idmap.h
+++ b/src/os/shared/inc/os-shared-idmap.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-idmap.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -545,4 +546,4 @@ bool  OS_ObjectNameMatch(void *ref, const OS_object_token_t *token, const OS_com
 int32 OS_ObjectIdFindNextMatch(OS_ObjectMatchFunc_t MatchFunc, void *arg, OS_object_token_t *token);
 int32 OS_ObjectIdFindNextFree(OS_object_token_t *token);
 
-#endif /* OS_SHARED_IDMAP_H  */
+#endif /* OS_SHARED_IDMAP_H */
diff --git a/src/os/shared/inc/os-shared-module.h b/src/os/shared/inc/os-shared-module.h
index 0031b420a..773d32c73 100644
--- a/src/os/shared/inc/os-shared-module.h
+++ b/src/os/shared/inc/os-shared-module.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-module.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -130,4 +131,4 @@ int32 OS_SymbolTableDump_Impl(const char *filename, size_t size_limit);
 int32 OS_ModuleLoad_Static(const char *ModuleName);
 int32 OS_SymbolLookup_Static(cpuaddr *SymbolAddress, const char *SymbolName, const char *ModuleName);
 
-#endif /* OS_SHARED_MODULE_H  */
+#endif /* OS_SHARED_MODULE_H */
diff --git a/src/os/shared/inc/os-shared-mutex.h b/src/os/shared/inc/os-shared-mutex.h
index 5ce6ed1a2..70d1c634f 100644
--- a/src/os/shared/inc/os-shared-mutex.h
+++ b/src/os/shared/inc/os-shared-mutex.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-mutex.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -97,4 +98,4 @@ int32 OS_MutSemDelete_Impl(const OS_object_token_t *token);
  ------------------------------------------------------------------*/
 int32 OS_MutSemGetInfo_Impl(const OS_object_token_t *token, OS_mut_sem_prop_t *mut_prop);
 
-#endif /* OS_SHARED_MUTEX_H  */
+#endif /* OS_SHARED_MUTEX_H */
diff --git a/src/os/shared/inc/os-shared-network.h b/src/os/shared/inc/os-shared-network.h
index 951c5d374..eca467e83 100644
--- a/src/os/shared/inc/os-shared-network.h
+++ b/src/os/shared/inc/os-shared-network.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-network.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -63,4 +64,4 @@ int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len);
  ------------------------------------------------------------------*/
 int32 OS_NetworkGetID_Impl(int32 *IdBuf);
 
-#endif /* OS_SHARED_NETWORK_H  */
+#endif /* OS_SHARED_NETWORK_H */
diff --git a/src/os/shared/inc/os-shared-printf.h b/src/os/shared/inc/os-shared-printf.h
index 721ed3ea8..8117ba578 100644
--- a/src/os/shared/inc/os-shared-printf.h
+++ b/src/os/shared/inc/os-shared-printf.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-printf.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -103,4 +104,4 @@ void OS_ConsoleOutput_Impl(const OS_object_token_t *token);
  ------------------------------------------------------------------*/
 void OS_ConsoleWakeup_Impl(const OS_object_token_t *token);
 
-#endif /* OS_SHARED_PRINTF_H  */
+#endif /* OS_SHARED_PRINTF_H */
diff --git a/src/os/shared/inc/os-shared-queue.h b/src/os/shared/inc/os-shared-queue.h
index 93a303f40..fc0b6dbf8 100644
--- a/src/os/shared/inc/os-shared-queue.h
+++ b/src/os/shared/inc/os-shared-queue.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-queue.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -107,4 +108,4 @@ int32 OS_QueuePut_Impl(const OS_object_token_t *token, const void *data, size_t
  ------------------------------------------------------------------*/
 int32 OS_QueueGetInfo_Impl(const OS_object_token_t *token, OS_queue_prop_t *queue_prop);
 
-#endif /* OS_SHARED_QUEUE_H  */
+#endif /* OS_SHARED_QUEUE_H */
diff --git a/src/os/shared/inc/os-shared-select.h b/src/os/shared/inc/os-shared-select.h
index 75cfef0c9..05ea8548f 100644
--- a/src/os/shared/inc/os-shared-select.h
+++ b/src/os/shared/inc/os-shared-select.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-select.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -78,4 +79,4 @@ int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags,
  ------------------------------------------------------------------*/
 int32 OS_SelectMultiple_Impl(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs);
 
-#endif /* OS_SHARED_SELECT_H  */
+#endif /* OS_SHARED_SELECT_H */
diff --git a/src/os/shared/inc/os-shared-shell.h b/src/os/shared/inc/os-shared-shell.h
index cf512ef8c..3b1ac1856 100644
--- a/src/os/shared/inc/os-shared-shell.h
+++ b/src/os/shared/inc/os-shared-shell.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-shell.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -44,4 +45,4 @@
  ------------------------------------------------------------------*/
 int32 OS_ShellOutputToFile_Impl(const OS_object_token_t *token, const char *Cmd);
 
-#endif /* OS_SHARED_SHELL_H  */
+#endif /* OS_SHARED_SHELL_H */
diff --git a/src/os/shared/inc/os-shared-sockets.h b/src/os/shared/inc/os-shared-sockets.h
index 37b77ee19..4cddb0934 100644
--- a/src/os/shared/inc/os-shared-sockets.h
+++ b/src/os/shared/inc/os-shared-sockets.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-sockets.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -180,4 +181,4 @@ int32 OS_SocketAddrSetPort_Impl(OS_SockAddr_t *Addr, uint16 PortNum);
  */
 void OS_CreateSocketName(const OS_object_token_t *token, const OS_SockAddr_t *Addr, const char *parent_name);
 
-#endif /* OS_SHARED_SOCKETS_H  */
+#endif /* OS_SHARED_SOCKETS_H */
diff --git a/src/os/shared/inc/os-shared-task.h b/src/os/shared/inc/os-shared-task.h
index 280ebbc71..b12c15025 100644
--- a/src/os/shared/inc/os-shared-task.h
+++ b/src/os/shared/inc/os-shared-task.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-task.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -192,4 +193,4 @@ bool OS_TaskIdMatchSystemData_Impl(void *ref, const OS_object_token_t *token, co
  ------------------------------------------------------------------*/
 int32 OS_TaskValidateSystemData_Impl(const void *sysdata, size_t sysdata_size);
 
-#endif /* OS_SHARED_TASK_H  */
+#endif /* OS_SHARED_TASK_H */
diff --git a/src/os/shared/inc/os-shared-time.h b/src/os/shared/inc/os-shared-time.h
index af5f15b81..3fc21039e 100644
--- a/src/os/shared/inc/os-shared-time.h
+++ b/src/os/shared/inc/os-shared-time.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-time.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -64,4 +65,4 @@ extern OS_timecb_internal_record_t OS_timecb_table[OS_MAX_TIMERS];
 ---------------------------------------------------------------------------------------*/
 int32 OS_TimerCbAPI_Init(void);
 
-#endif /* OS_SHARED_TIME_H  */
+#endif /* OS_SHARED_TIME_H */
diff --git a/src/os/shared/inc/os-shared-timebase.h b/src/os/shared/inc/os-shared-timebase.h
index c056a8fdc..429ba3e7f 100644
--- a/src/os/shared/inc/os-shared-timebase.h
+++ b/src/os/shared/inc/os-shared-timebase.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-shared-timebase.h
+ * \file
+ *
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -138,4 +139,4 @@ void OS_TimeBase_CallbackThread(osal_id_t timebase_id);
  ------------------------------------------------------------------*/
 int32 OS_Milli2Ticks(uint32 milli_seconds, int *ticks);
 
-#endif /* OS_SHARED_TIMEBASE_H  */
+#endif /* OS_SHARED_TIMEBASE_H */
diff --git a/src/os/vxworks/inc/os-impl-binsem.h b/src/os/vxworks/inc/os-impl-binsem.h
index d18aa9a61..5ec5e7133 100644
--- a/src/os/vxworks/inc/os-impl-binsem.h
+++ b/src/os/vxworks/inc/os-impl-binsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-binsem.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -41,4 +42,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_binsem_internal_record_t OS_impl_bin_sem_table[OS_MAX_BIN_SEMAPHORES];
 
-#endif /* OS_IMPL_BINSEM_H  */
+#endif /* OS_IMPL_BINSEM_H */
diff --git a/src/os/vxworks/inc/os-impl-console.h b/src/os/vxworks/inc/os-impl-console.h
index 56d44993c..8cadbf845 100644
--- a/src/os/vxworks/inc/os-impl-console.h
+++ b/src/os/vxworks/inc/os-impl-console.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-console.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -44,4 +45,4 @@ typedef struct
 
 extern OS_impl_console_internal_record_t OS_impl_console_table[OS_MAX_CONSOLES];
 
-#endif /* OS_IMPL_CONSOLE_H  */
+#endif /* OS_IMPL_CONSOLE_H */
diff --git a/src/os/vxworks/inc/os-impl-countsem.h b/src/os/vxworks/inc/os-impl-countsem.h
index 4d14393a2..c2da1f13e 100644
--- a/src/os/vxworks/inc/os-impl-countsem.h
+++ b/src/os/vxworks/inc/os-impl-countsem.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-countsem.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -41,4 +42,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_countsem_internal_record_t OS_impl_count_sem_table[OS_MAX_COUNT_SEMAPHORES];
 
-#endif /* OS_IMPL_COUNTSEM_H  */
+#endif /* OS_IMPL_COUNTSEM_H */
diff --git a/src/os/vxworks/inc/os-impl-dirs.h b/src/os/vxworks/inc/os-impl-dirs.h
index 5ae902ee2..4c02ab443 100644
--- a/src/os/vxworks/inc/os-impl-dirs.h
+++ b/src/os/vxworks/inc/os-impl-dirs.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-dirs.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -55,4 +56,4 @@ typedef struct
  */
 extern OS_impl_dir_internal_record_t OS_impl_dir_table[OS_MAX_NUM_OPEN_DIRS];
 
-#endif /* OS_IMPL_DIRS_H  */
+#endif /* OS_IMPL_DIRS_H */
diff --git a/src/os/vxworks/inc/os-impl-files.h b/src/os/vxworks/inc/os-impl-files.h
index 64378a043..78c2bc730 100644
--- a/src/os/vxworks/inc/os-impl-files.h
+++ b/src/os/vxworks/inc/os-impl-files.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-files.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -47,4 +48,4 @@
  */
 #define OS_IMPL_REGULAR_FILE_FLAGS 0
 
-#endif /* OS_IMPL_FILES_H  */
+#endif /* OS_IMPL_FILES_H */
diff --git a/src/os/vxworks/inc/os-impl-filesys.h b/src/os/vxworks/inc/os-impl-filesys.h
index b376ef0fa..30f4170b8 100644
--- a/src/os/vxworks/inc/os-impl-filesys.h
+++ b/src/os/vxworks/inc/os-impl-filesys.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-filesys.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -42,4 +43,4 @@ typedef struct
 
 extern OS_impl_filesys_internal_record_t OS_impl_filesys_table[OS_MAX_FILE_SYSTEMS];
 
-#endif /* OS_IMPL_FILESYS_H  */
+#endif /* OS_IMPL_FILESYS_H */
diff --git a/src/os/vxworks/inc/os-impl-gettime.h b/src/os/vxworks/inc/os-impl-gettime.h
index 5a66cabd9..955ca5b86 100644
--- a/src/os/vxworks/inc/os-impl-gettime.h
+++ b/src/os/vxworks/inc/os-impl-gettime.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-gettime.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -33,4 +34,4 @@
 
 #define OSAL_GETTIME_SOURCE_CLOCK CLOCK_MONOTONIC
 
-#endif /* OS_IMPL_GETTIME_H  */
+#endif /* OS_IMPL_GETTIME_H */
diff --git a/src/os/vxworks/inc/os-impl-idmap.h b/src/os/vxworks/inc/os-impl-idmap.h
index 2e2098a31..21def2f3c 100644
--- a/src/os/vxworks/inc/os-impl-idmap.h
+++ b/src/os/vxworks/inc/os-impl-idmap.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-idmap.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -41,4 +42,4 @@ typedef struct
 /* Tables where the lock state information is stored */
 extern OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER];
 
-#endif /* OS_IMPL_IDMAP_H  */
+#endif /* OS_IMPL_IDMAP_H */
diff --git a/src/os/vxworks/inc/os-impl-io.h b/src/os/vxworks/inc/os-impl-io.h
index 0968588f6..e44ba6a30 100644
--- a/src/os/vxworks/inc/os-impl-io.h
+++ b/src/os/vxworks/inc/os-impl-io.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-io.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -55,4 +56,4 @@ extern OS_impl_file_internal_record_t OS_impl_filehandle_table[OS_MAX_NUM_OPEN_F
  */
 #define GENERIC_IO_CONST_DATA_CAST (void *)
 
-#endif /* OS_IMPL_IO_H  */
+#endif /* OS_IMPL_IO_H */
diff --git a/src/os/vxworks/inc/os-impl-loader.h b/src/os/vxworks/inc/os-impl-loader.h
index 3093c6e5d..e444c2b1b 100644
--- a/src/os/vxworks/inc/os-impl-loader.h
+++ b/src/os/vxworks/inc/os-impl-loader.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-loader.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -51,4 +52,4 @@ typedef struct
  */
 extern OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES];
 
-#endif /* OS_IMPL_LOADER_H  */
+#endif /* OS_IMPL_LOADER_H */
diff --git a/src/os/vxworks/inc/os-impl-mutex.h b/src/os/vxworks/inc/os-impl-mutex.h
index 08bb6b388..35efeac5c 100644
--- a/src/os/vxworks/inc/os-impl-mutex.h
+++ b/src/os/vxworks/inc/os-impl-mutex.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-mutex.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -40,4 +41,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_mutsem_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES];
 
-#endif /* OS_IMPL_MUTEX_H  */
+#endif /* OS_IMPL_MUTEX_H */
diff --git a/src/os/vxworks/inc/os-impl-network.h b/src/os/vxworks/inc/os-impl-network.h
index 4b473c856..0e0f999e4 100644
--- a/src/os/vxworks/inc/os-impl-network.h
+++ b/src/os/vxworks/inc/os-impl-network.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-network.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -36,4 +37,4 @@
 #include <netinet/in.h>
 #include <hostLib.h>
 
-#endif /* OS_IMPL_NETWORK_H  */
+#endif /* OS_IMPL_NETWORK_H */
diff --git a/src/os/vxworks/inc/os-impl-queues.h b/src/os/vxworks/inc/os-impl-queues.h
index d82a7affe..c849200ee 100644
--- a/src/os/vxworks/inc/os-impl-queues.h
+++ b/src/os/vxworks/inc/os-impl-queues.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-queues.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -39,4 +40,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_queue_internal_record_t OS_impl_queue_table[OS_MAX_QUEUES];
 
-#endif /* OS_IMPL_QUEUES_H  */
+#endif /* OS_IMPL_QUEUES_H */
diff --git a/src/os/vxworks/inc/os-impl-select.h b/src/os/vxworks/inc/os-impl-select.h
index d29b5d8e5..b55f3644b 100644
--- a/src/os/vxworks/inc/os-impl-select.h
+++ b/src/os/vxworks/inc/os-impl-select.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-select.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -31,4 +32,4 @@
 #include "os-impl-io.h"
 #include <selectLib.h>
 
-#endif /* OS_IMPL_SELECT_H  */
+#endif /* OS_IMPL_SELECT_H */
diff --git a/src/os/vxworks/inc/os-impl-sockets.h b/src/os/vxworks/inc/os-impl-sockets.h
index 32dbabea2..07df16977 100644
--- a/src/os/vxworks/inc/os-impl-sockets.h
+++ b/src/os/vxworks/inc/os-impl-sockets.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-sockets.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -46,4 +47,4 @@
 /* The "in.h" header file supplied in VxWorks 6.9 is missing the "in_port_t" typedef */
 typedef u_short in_port_t;
 
-#endif /* OS_IMPL_SOCKETS_H  */
+#endif /* OS_IMPL_SOCKETS_H */
diff --git a/src/os/vxworks/inc/os-impl-symtab.h b/src/os/vxworks/inc/os-impl-symtab.h
index 037207385..963a16087 100644
--- a/src/os/vxworks/inc/os-impl-symtab.h
+++ b/src/os/vxworks/inc/os-impl-symtab.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-symtab.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -44,4 +45,4 @@ extern SymbolDumpState_t OS_VxWorks_SymbolDumpState;
 
 BOOL OS_SymTableIterator_Impl(char *name, SYM_VALUE val, SYM_TYPE type, _Vx_usr_arg_t arg, SYM_GROUP group);
 
-#endif /* OS_IMPL_SYMTAB_H  */
+#endif /* OS_IMPL_SYMTAB_H */
diff --git a/src/os/vxworks/inc/os-impl-tasks.h b/src/os/vxworks/inc/os-impl-tasks.h
index 12ef8f726..737512b1b 100644
--- a/src/os/vxworks/inc/os-impl-tasks.h
+++ b/src/os/vxworks/inc/os-impl-tasks.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-tasks.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -51,4 +52,4 @@ typedef struct
 /* Tables where the OS object information is stored */
 extern OS_impl_task_internal_record_t OS_impl_task_table[OS_MAX_TASKS];
 
-#endif /* OS_IMPL_TASKS_H  */
+#endif /* OS_IMPL_TASKS_H */
diff --git a/src/os/vxworks/inc/os-impl-timebase.h b/src/os/vxworks/inc/os-impl-timebase.h
index 72dbd22ba..1356c6fca 100644
--- a/src/os/vxworks/inc/os-impl-timebase.h
+++ b/src/os/vxworks/inc/os-impl-timebase.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-impl-timebase.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -61,4 +62,4 @@ typedef struct
 
 extern OS_impl_timebase_internal_record_t OS_impl_timebase_table[OS_MAX_TIMEBASES];
 
-#endif /* OS_IMPL_TIMEBASE_H  */
+#endif /* OS_IMPL_TIMEBASE_H */
diff --git a/src/os/vxworks/inc/os-vxworks.h b/src/os/vxworks/inc/os-vxworks.h
index 5c6cd95f0..bcefff61d 100644
--- a/src/os/vxworks/inc/os-vxworks.h
+++ b/src/os/vxworks/inc/os-vxworks.h
@@ -19,7 +19,8 @@
  */
 
 /**
- * \file     os-vxworks.h
+ * \file
+ *
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -82,4 +83,4 @@ int32 OS_VxWorks_GenericSemGive(SEM_ID vxid);
 
 int32 OS_VxWorks_TableMutex_Init(osal_objtype_t idtype);
 
-#endif /* OS_VXWORKS_H  */
+#endif /* OS_VXWORKS_H */