diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..2da34ba85
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# Contributing Guide
+
+Please see our [top-level contributing guide](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md) for more information on how to contribute. 
\ No newline at end of file
diff --git a/README.md b/README.md
index 46f9cc480..e57424bc3 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,35 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+
+### Development Build: v5.1.0-rc1+dev347
+
+- Moves copyblock size to a macro and add comments. Defines `OS_CP_BLOCK_SIZE` and adds clear documentation that it could be adjusted for page size, performance, etc.
+- Removes while loop
+- Replaces all #includes of <os and <OSC_ matches with " to match coding standard.
+- Consolidates the duplicated switch in `OS_SocketOpen_Impl`
+- Add const to input pointers for `OS_FdSet_ConvertIn_Impl` and `OS_ObjectIdTransactionFinish`
+- Removes network prototypes defined in `osapi_sockets.h` that are also in `osapi_network.h`
+- Removes `NULL` redefine from `common_types.h`
+- Adds `Contributing.md` that points to bundle-level contribution guide
+- Reports test cases that "fail" as "not implemented" with new `UtAssert_NA` macro instead of `UtPrintf`
+- Calls to `OS_SelectSingle` and `OS_SelectMultiple` will fail if an FD within the set is outside the range of the underlying `FD_SETSIZE` from the C library.
+- Fixes calculation used for the relative time interval in the `select()` call. Also adds a UT case that specifically exercises the carryover described. Fixes delay when this carry condition is hit
+- Documents algorithm that provides application-controlled timeout on the connection initiation. Also adds a debug statement if the connect fails for a reason other than `EINPROGRESS`. No impact to normal behavior.
+- Adds check for `EAGAIN` if the system fails to allocate kernel-internal resources.
+- Adds a `CompileTimeAssert` to confirm that the size of the abstract buffer for socket addresses is large enough to store any of the enabled address types thereby removing the need for runtime tests.
+- With this change, if `OS_SOCKADDR_MAX_LENis` not large enough for the address type, osal will fail to compile. This enforces that the abstract size is large enough for any/all enabled address types, regardless of what is actually used.
+- Adds missing functional test for `OS_ShellOutputToFile`
+- Add test for `fcntl()` error return of -1 and report errno. If setting `O_NONBLOCK` fails, then debug message is printed and blocking mode is used and timeouts will not work as a result.
+- Improves error codes when attempting to seek on a pipe/socket. Translates the `OS_ERR_OPERATION_NOT_SUPPORTED` error rather than "not implemented". The `ESPIPE` errno means that seeking is not supported on the given file handle.
+- Renames `OS_U32ValueWrapper_t` as `OS_VoidPtrValueWrapper_t` to better indicate its purpose. The point is to pass a value through a `void*`. Adds a compile-time assert to check that this is only used to directly pass values which have a size of less than or equal to sizeof(void*).
+- Refactors the return statement for `OS_FileSys_FindVirtMountPoint()` so it is easier to read and adds some informational comments.
+- Reports an error if calling `timer_gettime` after `timer_settime` fails.
+- Returns `OS_ERROR` status to caller after an error on moduleInfoGet()
+- Removes an extraneous/unreachable OS_ObjectIdDefined check and its accompanying debug statement. The only way this check could have been reached would be if the normal unlock process was bypassed such that the underlying OS mutex was unlocked but OSAL state still had it owned by a task. This condition never happens at runtime.
+- Updates documentation for `OS_MAX_MODULE`
+- See <https://github.com/nasa/osal/pull/917>
+
 ### Development Build: v5.1.0-rc1+dev297
 
 - Fix #836, Add Testing Tools to the Security Policy
diff --git a/src/os/inc/common_types.h b/src/os/inc/common_types.h
index ae36830e5..ff5ed718c 100644
--- a/src/os/inc/common_types.h
+++ b/src/os/inc/common_types.h
@@ -125,10 +125,6 @@ extern "C"
      */
     typedef void (*OS_ArgCallback_t)(osal_id_t object_id, void *arg);
 
-#ifndef NULL /* pointer to nothing */
-#define NULL ((void *)0)
-#endif
-
     /*
     ** Check Sizes
     */
diff --git a/src/os/inc/osapi-sockets.h b/src/os/inc/osapi-sockets.h
index 743c6d810..92c5f567c 100644
--- a/src/os/inc/osapi-sockets.h
+++ b/src/os/inc/osapi-sockets.h
@@ -368,35 +368,6 @@ int32 OS_SocketGetIdByName(osal_id_t *sock_id, const char *sock_name);
  */
 int32 OS_SocketGetInfo(osal_id_t sock_id, OS_socket_prop_t *sock_prop);
 
-/*-------------------------------------------------------------------------------------*/
-/**
- * @brief  Gets the network ID of the local machine
- *
- * The ID is an implementation-defined value and may not be consistent
- * in meaning across different platform types.
- *
- * @note This API may be removed in a future version of OSAL due to
- *       inconsistencies between platforms.
- *
- * @return The ID or fixed value of -1 if the host id could not be found.
- *         Note it is not possible to differentiate between error codes and valid
- *         network IDs here. It is assumed, however, that -1 is never a valid ID.
- */
-int32 OS_NetworkGetID(void);
-
-/*-------------------------------------------------------------------------------------*/
-/**
- * @brief Gets the local machine network host name
- *
- * If configured in the underlying network stack,
- * this function retrieves the local hostname of the system.
- *
- * @param[out]  host_name    Buffer to hold name information
- * @param[in]   name_len     Maximum length of host name buffer
- *
- * @return Execution status, see @ref OSReturnCodes
- */
-int32 OS_NetworkGetHostName(char *host_name, size_t name_len);
 /**@}*/
 
 #endif
diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
index 45db59c9f..6ca9de542 100644
--- a/src/os/inc/osapi-version.h
+++ b/src/os/inc/osapi-version.h
@@ -32,7 +32,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   297
+#define OS_BUILD_NUMBER   347
 #define OS_BUILD_BASELINE "v5.1.0-rc1"
 
 /*
diff --git a/src/os/portable/os-impl-bsd-select.c b/src/os/portable/os-impl-bsd-select.c
index dbfb19622..70575e6c9 100644
--- a/src/os/portable/os-impl-bsd-select.c
+++ b/src/os/portable/os-impl-bsd-select.c
@@ -72,32 +72,40 @@
  *
  * returns: Highest numbered file descriptor in the output fd_set
  *-----------------------------------------------------------------*/
-static int OS_FdSet_ConvertIn_Impl(fd_set *os_set, OS_FdSet *OSAL_set)
+static int32 OS_FdSet_ConvertIn_Impl(int *os_maxfd, fd_set *os_set, const OS_FdSet *OSAL_set)
 {
     size_t       offset;
     size_t       bit;
     osal_index_t id;
     uint8        objids;
     int          osfd;
-    int          maxfd;
+    int32        status;
 
-    maxfd = -1;
+    status = OS_SUCCESS;
     for (offset = 0; offset < sizeof(OSAL_set->object_ids); ++offset)
     {
         objids = OSAL_set->object_ids[offset];
         bit    = 0;
         while (objids != 0)
         {
-            if (objids & 0x01)
+            id = OSAL_INDEX_C((offset * 8) + bit);
+            if ((objids & 0x01) != 0 && id < OS_MAX_NUM_OPEN_FILES)
             {
-                id   = OSAL_INDEX_C((offset * 8) + bit);
                 osfd = OS_impl_filehandle_table[id].fd;
-                if (osfd >= 0 && OS_impl_filehandle_table[id].selectable)
+                if (osfd >= 0)
                 {
-                    FD_SET(osfd, os_set);
-                    if (osfd > maxfd)
+                    if (osfd >= FD_SETSIZE || !OS_impl_filehandle_table[id].selectable)
+                    {
+                        /* out of range of select() implementation */
+                        status = OS_ERR_OPERATION_NOT_SUPPORTED;
+                    }
+                    else
                     {
-                        maxfd = osfd;
+                        FD_SET(osfd, os_set);
+                        if (osfd > *os_maxfd)
+                        {
+                            *os_maxfd = osfd;
+                        }
                     }
                 }
             }
@@ -106,7 +114,7 @@ static int OS_FdSet_ConvertIn_Impl(fd_set *os_set, OS_FdSet *OSAL_set)
         }
     }
 
-    return maxfd;
+    return status;
 } /* end OS_FdSet_ConvertIn_Impl */
 
 /*----------------------------------------------------------------
@@ -134,9 +142,9 @@ static void OS_FdSet_ConvertOut_Impl(fd_set *output, OS_FdSet *Input)
         bit    = 0;
         while (objids != 0)
         {
-            if (objids & 0x01)
+            id = OSAL_INDEX_C((offset * 8) + bit);
+            if ((objids & 0x01) != 0 && id < OS_MAX_NUM_OPEN_FILES)
             {
-                id   = OSAL_INDEX_C((offset * 8) + bit);
                 osfd = OS_impl_filehandle_table[id].fd;
                 if (osfd < 0 || !FD_ISSET(osfd, output))
                 {
@@ -214,12 +222,12 @@ static int32 OS_DoSelect(int maxfd, fd_set *rd_set, fd_set *wr_set, int32 msecs)
             if (tv.tv_usec < 0)
             {
                 tv.tv_usec += 1000000;
-                ++tv.tv_sec;
+                --tv.tv_sec;
             }
         }
 
         os_status = select(maxfd + 1, rd_set, wr_set, NULL, tvptr);
-    } while (os_status < 0 && errno == EINTR);
+    } while (os_status < 0 && (errno == EINTR || errno == EAGAIN));
 
     if (os_status < 0)
     {
@@ -267,6 +275,12 @@ int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags,
         return OS_ERR_OPERATION_NOT_SUPPORTED;
     }
 
+    if (impl->fd >= FD_SETSIZE)
+    {
+        /* out of range of select() implementation */
+        return OS_ERR_OPERATION_NOT_SUPPORTED;
+    }
+
     if (*SelectFlags != 0)
     {
         FD_ZERO(&wr_set);
@@ -319,34 +333,26 @@ int32 OS_SelectMultiple_Impl(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs)
 {
     fd_set wr_set;
     fd_set rd_set;
-    int    osfd;
     int    maxfd;
     int32  return_code;
 
-    /*
-     * This return code will be used if the set(s) do not
-     * contain any file handles capable of select().  It
-     * will be overwritten with the real result of the
-     * select call, if selectable file handles were specified.
-     */
-    return_code = OS_ERR_OPERATION_NOT_SUPPORTED;
     FD_ZERO(&rd_set);
     FD_ZERO(&wr_set);
     maxfd = -1;
     if (ReadSet != NULL)
     {
-        osfd = OS_FdSet_ConvertIn_Impl(&rd_set, ReadSet);
-        if (osfd > maxfd)
+        return_code = OS_FdSet_ConvertIn_Impl(&maxfd, &rd_set, ReadSet);
+        if (return_code != OS_SUCCESS)
         {
-            maxfd = osfd;
+            return return_code;
         }
     }
     if (WriteSet != NULL)
     {
-        osfd = OS_FdSet_ConvertIn_Impl(&wr_set, WriteSet);
-        if (osfd > maxfd)
+        return_code = OS_FdSet_ConvertIn_Impl(&maxfd, &wr_set, WriteSet);
+        if (return_code != OS_SUCCESS)
         {
-            maxfd = osfd;
+            return return_code;
         }
     }
 
@@ -354,6 +360,14 @@ int32 OS_SelectMultiple_Impl(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs)
     {
         return_code = OS_DoSelect(maxfd, &rd_set, &wr_set, msecs);
     }
+    else
+    {
+        /*
+         * This return code will be used if the set(s) were
+         * both empty/NULL or otherwise did not contain valid filehandles.
+         */
+        return_code = OS_ERR_INVALID_ID;
+    }
 
     if (return_code == OS_SUCCESS)
     {
diff --git a/src/os/portable/os-impl-bsd-sockets.c b/src/os/portable/os-impl-bsd-sockets.c
index 59bc5d26a..8ae708883 100644
--- a/src/os/portable/os-impl-bsd-sockets.c
+++ b/src/os/portable/os-impl-bsd-sockets.c
@@ -73,6 +73,15 @@ typedef union
 #endif
 } OS_SockAddr_Accessor_t;
 
+/*
+ * Confirm that the abstract socket address buffer size (OS_SOCKADDR_MAX_LEN) is
+ * large enough to store any of the enabled address types.  If this is true, the
+ * size of the above union will match OS_SOCKADDR_MAX_LEN.  However, if any
+ * implemention-provided struct types are larger than this, the union will be
+ * larger, and this indicates a configuration error.
+ */
+CompileTimeAssert(sizeof(OS_SockAddr_Accessor_t) == OS_SOCKADDR_MAX_LEN, SockAddrSize);
+
 /****************************************************************************************
                                     Sockets API
  ***************************************************************************************/
@@ -102,10 +111,13 @@ int32 OS_SocketOpen_Impl(const OS_object_token_t *token)
     switch (stream->socket_type)
     {
         case OS_SocketType_DATAGRAM:
-            os_type = SOCK_DGRAM;
+            os_type  = SOCK_DGRAM;
+            os_proto = IPPROTO_UDP;
             break;
+
         case OS_SocketType_STREAM:
-            os_type = SOCK_STREAM;
+            os_type  = SOCK_STREAM;
+            os_proto = IPPROTO_TCP;
             break;
 
         default:
@@ -126,17 +138,6 @@ int32 OS_SocketOpen_Impl(const OS_object_token_t *token)
             return OS_ERR_NOT_IMPLEMENTED;
     }
 
-    /* Only AF_INET* at this point, can add cases if support is expanded */
-    switch (stream->socket_type)
-    {
-        case OS_SocketType_DATAGRAM:
-            os_proto = IPPROTO_UDP;
-            break;
-        case OS_SocketType_STREAM:
-            os_proto = IPPROTO_TCP;
-            break;
-    }
-
     impl->fd = socket(os_domain, os_type, os_proto);
     if (impl->fd < 0)
     {
@@ -200,7 +201,7 @@ int32 OS_SocketBind_Impl(const OS_object_token_t *token, const OS_SockAddr_t *Ad
             break;
     }
 
-    if (addrlen == 0 || addrlen > OS_SOCKADDR_MAX_LEN)
+    if (addrlen == 0)
     {
         return OS_ERR_BAD_ADDRESS;
     }
@@ -273,10 +274,24 @@ int32 OS_SocketConnect_Impl(const OS_object_token_t *token, const OS_SockAddr_t
         {
             if (errno != EINPROGRESS)
             {
+                OS_DEBUG("connect: %s\n", strerror(errno));
                 return_code = OS_ERROR;
             }
             else
             {
+                /*
+                 * If the socket was created in nonblocking mode (O_NONBLOCK flag) then the connect
+                 * runs in the background and connect() returns EINPROGRESS.  In this case we still
+                 * want to provide the "normal" (blocking) semantics to the calling app, such that
+                 * when OS_SocketConnect() returns, the socket is ready for use.
+                 *
+                 * To provide consistent behavior to calling apps, this does a select() to wait
+                 * for the socket to become writable, meaning that the remote side is connected.
+                 *
+                 * An important point here is that the calling app can control the timeout.  If the
+                 * normal/blocking connect() was used, the OS/IP stack controls the timeout, and it
+                 * can be quite long.
+                 */
                 operation = OS_STREAM_STATE_WRITABLE;
                 if (impl->selectable)
                 {
@@ -290,6 +305,10 @@ int32 OS_SocketConnect_Impl(const OS_object_token_t *token, const OS_SockAddr_t
                     }
                     else
                     {
+                        /*
+                         * The SO_ERROR socket flag should also read back zero.
+                         * If not zero, something went wrong during connect
+                         */
                         sockopt   = 0;
                         slen      = sizeof(sockopt);
                         os_status = getsockopt(impl->fd, SOL_SOCKET, SO_ERROR, &sockopt, &slen);
@@ -560,7 +579,7 @@ int32 OS_SocketAddrInit_Impl(OS_SockAddr_t *Addr, OS_SocketDomain_t Domain)
             break;
     }
 
-    if (addrlen == 0 || addrlen > OS_SOCKADDR_MAX_LEN)
+    if (addrlen == 0)
     {
         return OS_ERR_NOT_IMPLEMENTED;
     }
diff --git a/src/os/portable/os-impl-posix-io.c b/src/os/portable/os-impl-posix-io.c
index cabe43541..f6b2e3107 100644
--- a/src/os/portable/os-impl-posix-io.c
+++ b/src/os/portable/os-impl-posix-io.c
@@ -138,7 +138,7 @@ int32 OS_GenericSeek_Impl(const OS_object_token_t *token, int32 offset, uint32 w
              * Use a different error code to differentiate from an
              * error involving a bad whence/offset
              */
-            retval = OS_ERR_NOT_IMPLEMENTED;
+            retval = OS_ERR_OPERATION_NOT_SUPPORTED;
         }
         else
         {
diff --git a/src/os/posix/inc/os-impl-tasks.h b/src/os/posix/inc/os-impl-tasks.h
index da25cd0ea..879baed6c 100644
--- a/src/os/posix/inc/os-impl-tasks.h
+++ b/src/os/posix/inc/os-impl-tasks.h
@@ -28,7 +28,7 @@
 #ifndef OS_IMPL_TASKS_H
 #define OS_IMPL_TASKS_H
 
-#include <os-shared-task.h>
+#include "os-shared-task.h"
 
 #include "osconfig.h"
 #include <pthread.h>
diff --git a/src/os/posix/inc/os-posix.h b/src/os/posix/inc/os-posix.h
index 9c2c1d2c9..33105f97d 100644
--- a/src/os/posix/inc/os-posix.h
+++ b/src/os/posix/inc/os-posix.h
@@ -53,7 +53,7 @@
 /*
  * Use the global definitions from the shared layer
  */
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /****************************************************************************************
                                      DEFINES
diff --git a/src/os/posix/src/os-impl-console.c b/src/os/posix/src/os-impl-console.c
index e1bca4450..672770fc7 100644
--- a/src/os/posix/src/os-impl-console.c
+++ b/src/os/posix/src/os-impl-console.c
@@ -90,7 +90,7 @@ void OS_ConsoleWakeup_Impl(const OS_object_token_t *token)
  *-----------------------------------------------------------------*/
 static void *OS_ConsoleTask_Entry(void *arg)
 {
-    OS_U32ValueWrapper_t               local_arg;
+    OS_VoidPtrValueWrapper_t           local_arg;
     OS_impl_console_internal_record_t *local;
     OS_object_token_t                  token;
 
@@ -123,7 +123,7 @@ int32 OS_ConsoleCreate_Impl(const OS_object_token_t *token)
     OS_impl_console_internal_record_t *local;
     pthread_t                          consoletask;
     int32                              return_code;
-    OS_U32ValueWrapper_t               local_arg = {0};
+    OS_VoidPtrValueWrapper_t           local_arg = {0};
 
     local = OS_OBJECT_TABLE_GET(OS_impl_console_table, *token);
 
diff --git a/src/os/posix/src/os-impl-tasks.c b/src/os/posix/src/os-impl-tasks.c
index bf1761772..e45beefa9 100644
--- a/src/os/posix/src/os-impl-tasks.c
+++ b/src/os/posix/src/os-impl-tasks.c
@@ -116,7 +116,7 @@ static void OS_NoopSigHandler(int signal) {} /* end OS_NoopSigHandler */
 ---------------------------------------------------------------------------------------*/
 static void *OS_PthreadTaskEntry(void *arg)
 {
-    OS_U32ValueWrapper_t local_arg;
+    OS_VoidPtrValueWrapper_t local_arg;
 
     local_arg.opaque_arg = arg;
     OS_TaskEntryPoint(local_arg.id); /* Never returns */
@@ -577,7 +577,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority
  *-----------------------------------------------------------------*/
 int32 OS_TaskCreate_Impl(const OS_object_token_t *token, uint32 flags)
 {
-    OS_U32ValueWrapper_t            arg;
+    OS_VoidPtrValueWrapper_t        arg;
     int32                           return_code;
     OS_impl_task_internal_record_t *impl;
     OS_task_internal_record_t *     task;
@@ -797,10 +797,10 @@ int32 OS_TaskSetPriority_Impl(const OS_object_token_t *token, osal_priority_t ne
  *-----------------------------------------------------------------*/
 int32 OS_TaskRegister_Impl(osal_id_t global_task_id)
 {
-    int32                return_code;
-    OS_U32ValueWrapper_t arg;
-    int                  old_state;
-    int                  old_type;
+    int32                    return_code;
+    OS_VoidPtrValueWrapper_t arg;
+    int                      old_state;
+    int                      old_type;
 
     /*
      * Set cancel state=ENABLED, type=DEFERRED
@@ -838,7 +838,7 @@ int32 OS_TaskRegister_Impl(osal_id_t global_task_id)
  *-----------------------------------------------------------------*/
 osal_id_t OS_TaskGetId_Impl(void)
 {
-    OS_U32ValueWrapper_t self_record;
+    OS_VoidPtrValueWrapper_t self_record;
 
     self_record.opaque_arg = pthread_getspecific(POSIX_GlobalVars.ThreadKey);
 
diff --git a/src/os/posix/src/os-impl-timebase.c b/src/os/posix/src/os-impl-timebase.c
index 669f17e7e..1c35b0279 100644
--- a/src/os/posix/src/os-impl-timebase.c
+++ b/src/os/posix/src/os-impl-timebase.c
@@ -315,7 +315,7 @@ int32 OS_Posix_TimeBaseAPI_Impl_Init(void)
 
 static void *OS_TimeBasePthreadEntry(void *arg)
 {
-    OS_U32ValueWrapper_t local_arg;
+    OS_VoidPtrValueWrapper_t local_arg;
 
     local_arg.opaque_arg = arg;
     OS_TimeBase_CallbackThread(local_arg.id);
@@ -340,7 +340,7 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token)
     struct timespec                     ts;
     OS_impl_timebase_internal_record_t *local;
     OS_timebase_internal_record_t *     timebase;
-    OS_U32ValueWrapper_t                arg;
+    OS_VoidPtrValueWrapper_t            arg;
 
     local    = OS_OBJECT_TABLE_GET(OS_impl_timebase_table, *token);
     timebase = OS_OBJECT_TABLE_GET(OS_timebase_table, *token);
diff --git a/src/os/rtems/inc/os-rtems.h b/src/os/rtems/inc/os-rtems.h
index b901f3911..4b9a9d2a4 100644
--- a/src/os/rtems/inc/os-rtems.h
+++ b/src/os/rtems/inc/os-rtems.h
@@ -47,7 +47,7 @@
 #include <rtems/malloc.h>
 #include <rtems/rtems/intr.h>
 
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /****************************************************************************************
                                      DEFINES
diff --git a/src/os/rtems/src/os-impl-timebase.c b/src/os/rtems/src/os-impl-timebase.c
index 321b02109..2c59cdc29 100644
--- a/src/os/rtems/src/os-impl-timebase.c
+++ b/src/os/rtems/src/os-impl-timebase.c
@@ -128,7 +128,7 @@ void OS_TimeBaseUnlock_Impl(const OS_object_token_t *token)
  *-----------------------------------------------------------------*/
 static rtems_timer_service_routine OS_TimeBase_ISR(rtems_id rtems_timer_id, void *arg)
 {
-    OS_U32ValueWrapper_t                user_data;
+    OS_VoidPtrValueWrapper_t            user_data;
     OS_object_token_t                   token;
     OS_impl_timebase_internal_record_t *local;
 
@@ -427,7 +427,7 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token)
  *-----------------------------------------------------------------*/
 int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uint32 interval_time)
 {
-    OS_U32ValueWrapper_t                user_data;
+    OS_VoidPtrValueWrapper_t            user_data;
     OS_impl_timebase_internal_record_t *local;
     int32                               return_code;
     int                                 status;
diff --git a/src/os/shared/inc/os-shared-binsem.h b/src/os/shared/inc/os-shared-binsem.h
index b4273c426..9ae72ba85 100644
--- a/src/os/shared/inc/os-shared-binsem.h
+++ b/src/os/shared/inc/os-shared-binsem.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_BINSEM_H
 
 #include "osapi-binsem.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /* other objects that have only an API name and no other data */
 typedef struct
diff --git a/src/os/shared/inc/os-shared-clock.h b/src/os/shared/inc/os-shared-clock.h
index dab3a5ea1..9619f9bf1 100644
--- a/src/os/shared/inc/os-shared-clock.h
+++ b/src/os/shared/inc/os-shared-clock.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_CLOCK_H
 
 #include "osapi-clock.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /*
  * Clock API low-level handlers
diff --git a/src/os/shared/inc/os-shared-common.h b/src/os/shared/inc/os-shared-common.h
index f9eb15180..32927226f 100644
--- a/src/os/shared/inc/os-shared-common.h
+++ b/src/os/shared/inc/os-shared-common.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_COMMON_H
 
 #include "osapi-common.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /*
  * A "magic number" that when written to the "ShutdownFlag" member
diff --git a/src/os/shared/inc/os-shared-countsem.h b/src/os/shared/inc/os-shared-countsem.h
index c02cc9db4..67099b5bb 100644
--- a/src/os/shared/inc/os-shared-countsem.h
+++ b/src/os/shared/inc/os-shared-countsem.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_COUNTSEM_H
 
 #include "osapi-countsem.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /* other objects that have only an API name and no other data */
 typedef struct
diff --git a/src/os/shared/inc/os-shared-dir.h b/src/os/shared/inc/os-shared-dir.h
index 081f5ae60..52bc5da22 100644
--- a/src/os/shared/inc/os-shared-dir.h
+++ b/src/os/shared/inc/os-shared-dir.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_DIR_H
 
 #include "osapi-dir.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /* directory objects */
 typedef struct
diff --git a/src/os/shared/inc/os-shared-errors.h b/src/os/shared/inc/os-shared-errors.h
index a93764caf..59cf8d21a 100644
--- a/src/os/shared/inc/os-shared-errors.h
+++ b/src/os/shared/inc/os-shared-errors.h
@@ -28,7 +28,7 @@
 #ifndef OS_SHARED_ERRORS_H
 #define OS_SHARED_ERRORS_H
 
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /* Mapping of integer error number to name */
 typedef struct
diff --git a/src/os/shared/inc/os-shared-file.h b/src/os/shared/inc/os-shared-file.h
index 715908dc3..a3177f2d1 100644
--- a/src/os/shared/inc/os-shared-file.h
+++ b/src/os/shared/inc/os-shared-file.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_FILE_H
 
 #include "osapi-file.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 typedef struct
 {
diff --git a/src/os/shared/inc/os-shared-filesys.h b/src/os/shared/inc/os-shared-filesys.h
index b16a3765e..52e3c7467 100644
--- a/src/os/shared/inc/os-shared-filesys.h
+++ b/src/os/shared/inc/os-shared-filesys.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_FILESYS_H
 
 #include "osapi-filesys.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /**
  * This flag will be set on the internal record to indicate
diff --git a/src/os/shared/inc/os-shared-globaldefs.h b/src/os/shared/inc/os-shared-globaldefs.h
index dc35c88c4..0f604c8e3 100644
--- a/src/os/shared/inc/os-shared-globaldefs.h
+++ b/src/os/shared/inc/os-shared-globaldefs.h
@@ -65,6 +65,9 @@ typedef struct OS_object_token OS_object_token_t;
  * Wrapper for encoding of other types into a generic void* type required as argument
  * to callbacks and pthread entry/return values, etc.
  *
+ * This is used where OSAL needs to pass non-pointer/integer values through an interface
+ * that accepts a void* opaque pass-through argument.
+ *
  * Note this can only encode types with sizes <= sizeof(void*)
  */
 typedef union
@@ -73,7 +76,14 @@ typedef union
     OS_ArgCallback_t arg_callback_func;
     osal_id_t        id;
     osal_index_t     idx;
-} OS_U32ValueWrapper_t;
+} OS_VoidPtrValueWrapper_t;
+
+/*
+ * The wrapper structure size should be equal to void* - if not this means
+ * one or more of the other members are bigger than void*, and therefore cannot
+ * be passed directly through the intended interface
+ */
+CompileTimeAssert(sizeof(OS_VoidPtrValueWrapper_t) == sizeof(void *), VoidValueWrapperSize);
 
 /*
  * The "OS_DEBUG" is a no-op unless OSAL_CONFIG_DEBUG_PRINTF is enabled.
diff --git a/src/os/shared/inc/os-shared-heap.h b/src/os/shared/inc/os-shared-heap.h
index d419d7d4a..72b786636 100644
--- a/src/os/shared/inc/os-shared-heap.h
+++ b/src/os/shared/inc/os-shared-heap.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_HEAP_H
 
 #include "osapi-heap.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /****************************************************************************************
                     MEMORY HEAP API LOW-LEVEL IMPLEMENTATION FUNCTIONS
diff --git a/src/os/shared/inc/os-shared-idmap.h b/src/os/shared/inc/os-shared-idmap.h
index 9f487c82e..ae798ff9b 100644
--- a/src/os/shared/inc/os-shared-idmap.h
+++ b/src/os/shared/inc/os-shared-idmap.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_IDMAP_H
 
 #include "osapi-idmap.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 #define OS_OBJECT_ID_RESERVED ((osal_id_t) {0xFFFFFFFF})
 
@@ -364,7 +364,7 @@ void OS_ObjectIdTransactionCancel(OS_object_token_t *token);
 
     Returns: None
  ------------------------------------------------------------------*/
-void OS_ObjectIdTransactionFinish(OS_object_token_t *token, osal_id_t *final_id);
+void OS_ObjectIdTransactionFinish(OS_object_token_t *token, const osal_id_t *final_id);
 
 /*----------------------------------------------------------------
    Function: OS_ObjectIdConvertToken
diff --git a/src/os/shared/inc/os-shared-module.h b/src/os/shared/inc/os-shared-module.h
index 5f0e53adb..0031b420a 100644
--- a/src/os/shared/inc/os-shared-module.h
+++ b/src/os/shared/inc/os-shared-module.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_MODULE_H
 
 #include "osapi-module.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 typedef enum
 {
diff --git a/src/os/shared/inc/os-shared-mutex.h b/src/os/shared/inc/os-shared-mutex.h
index 524f9fcde..5ce6ed1a2 100644
--- a/src/os/shared/inc/os-shared-mutex.h
+++ b/src/os/shared/inc/os-shared-mutex.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_MUTEX_H
 
 #include "osapi-mutex.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 typedef struct
 {
diff --git a/src/os/shared/inc/os-shared-network.h b/src/os/shared/inc/os-shared-network.h
index 19fd03d79..951c5d374 100644
--- a/src/os/shared/inc/os-shared-network.h
+++ b/src/os/shared/inc/os-shared-network.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_NETWORK_H
 
 #include "osapi-network.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /****************************************************************************************
               NETWORK / SOCKET API LOW-LEVEL IMPLEMENTATION FUNCTIONS
diff --git a/src/os/shared/inc/os-shared-printf.h b/src/os/shared/inc/os-shared-printf.h
index 43393a154..721ed3ea8 100644
--- a/src/os/shared/inc/os-shared-printf.h
+++ b/src/os/shared/inc/os-shared-printf.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_PRINTF_H
 
 #include "osapi-printf.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /*
  * Variables related to the console buffer.
diff --git a/src/os/shared/inc/os-shared-queue.h b/src/os/shared/inc/os-shared-queue.h
index d0d123989..93a303f40 100644
--- a/src/os/shared/inc/os-shared-queue.h
+++ b/src/os/shared/inc/os-shared-queue.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_QUEUE_H
 
 #include "osapi-queue.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 typedef struct
 {
diff --git a/src/os/shared/inc/os-shared-select.h b/src/os/shared/inc/os-shared-select.h
index 051bf4a50..75cfef0c9 100644
--- a/src/os/shared/inc/os-shared-select.h
+++ b/src/os/shared/inc/os-shared-select.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_SELECT_H
 
 #include "osapi-select.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /*
  * Select API
diff --git a/src/os/shared/inc/os-shared-shell.h b/src/os/shared/inc/os-shared-shell.h
index db58583b7..cf512ef8c 100644
--- a/src/os/shared/inc/os-shared-shell.h
+++ b/src/os/shared/inc/os-shared-shell.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_SHELL_H
 
 #include "osapi-shell.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /****************************************************************************************
                  SHELL API LOW-LEVEL IMPLEMENTATION FUNCTIONS
diff --git a/src/os/shared/inc/os-shared-sockets.h b/src/os/shared/inc/os-shared-sockets.h
index 7c3175753..37b77ee19 100644
--- a/src/os/shared/inc/os-shared-sockets.h
+++ b/src/os/shared/inc/os-shared-sockets.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_SOCKETS_H
 
 #include "osapi-sockets.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /*
  * Sockets API abstraction layer
diff --git a/src/os/shared/inc/os-shared-task.h b/src/os/shared/inc/os-shared-task.h
index 29f45fcbe..280ebbc71 100644
--- a/src/os/shared/inc/os-shared-task.h
+++ b/src/os/shared/inc/os-shared-task.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_TASK_H
 
 #include "osapi-task.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /*tasks */
 typedef struct
diff --git a/src/os/shared/inc/os-shared-time.h b/src/os/shared/inc/os-shared-time.h
index 1cf14a15e..af5f15b81 100644
--- a/src/os/shared/inc/os-shared-time.h
+++ b/src/os/shared/inc/os-shared-time.h
@@ -30,8 +30,8 @@
 
 #include "osapi-timer.h"
 
-#include <os-shared-globaldefs.h>
-#include <os-shared-idmap.h>
+#include "os-shared-globaldefs.h"
+#include "os-shared-idmap.h"
 
 #define TIMECB_FLAG_DEDICATED_TIMEBASE 0x1
 
diff --git a/src/os/shared/inc/os-shared-timebase.h b/src/os/shared/inc/os-shared-timebase.h
index 4e838d227..c056a8fdc 100644
--- a/src/os/shared/inc/os-shared-timebase.h
+++ b/src/os/shared/inc/os-shared-timebase.h
@@ -29,7 +29,7 @@
 #define OS_SHARED_TIMEBASE_H
 
 #include "osapi-timebase.h"
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 typedef struct
 {
diff --git a/src/os/shared/src/osapi-common.c b/src/os/shared/src/osapi-common.c
index 2848228c8..cf6bad493 100644
--- a/src/os/shared/src/osapi-common.c
+++ b/src/os/shared/src/osapi-common.c
@@ -352,8 +352,6 @@ void OS_DeleteAllObjects(void)
         }
         OS_TaskDelay(5);
     }
-    while (ObjectCount > 0 && TryCount < 5)
-        ;
 } /* end OS_DeleteAllObjects */
 
 /*----------------------------------------------------------------
diff --git a/src/os/shared/src/osapi-file.c b/src/os/shared/src/osapi-file.c
index ba123c736..57018ba1d 100644
--- a/src/os/shared/src/osapi-file.c
+++ b/src/os/shared/src/osapi-file.c
@@ -66,6 +66,14 @@ enum
 
 OS_stream_internal_record_t OS_stream_table[OS_MAX_NUM_OPEN_FILES];
 
+/*
+ * OS_cp copyblock size - in theory could be adjusted
+ * to match page size for performance so providing a unique
+ * define here.  Given a requirement/request could be transitioned
+ * to a configuration parameter
+ */
+#define OS_CP_BLOCK_SIZE 512
+
 /*----------------------------------------------------------------
  *
  * Helper function to close a file from an iterator
@@ -420,7 +428,7 @@ int32 OS_cp(const char *src, const char *dest)
     int32     wr_total;
     osal_id_t file1;
     osal_id_t file2;
-    uint8     copyblock[512];
+    uint8     copyblock[OS_CP_BLOCK_SIZE];
 
     /* Check Parameters */
     OS_CHECK_POINTER(src);
diff --git a/src/os/shared/src/osapi-filesys.c b/src/os/shared/src/osapi-filesys.c
index 12769b912..8a209fe13 100644
--- a/src/os/shared/src/osapi-filesys.c
+++ b/src/os/shared/src/osapi-filesys.c
@@ -104,8 +104,26 @@ bool OS_FileSys_FindVirtMountPoint(void *ref, const OS_object_token_t *token, co
     }
 
     mplen = OS_strnlen(filesys->virtual_mountpt, sizeof(filesys->virtual_mountpt));
-    return (mplen > 0 && mplen < sizeof(filesys->virtual_mountpt) &&
-            strncmp(target, filesys->virtual_mountpt, mplen) == 0 && (target[mplen] == '/' || target[mplen] == 0));
+
+    /*
+     * The virtual_mountpt member should be a substring of the search target.
+     * If this matches a basic substring check then it may be match
+     */
+    if (mplen == 0 || mplen >= sizeof(filesys->virtual_mountpt) ||
+        strncmp(target, filesys->virtual_mountpt, mplen) != 0)
+    {
+        /* not a substring, so not a match */
+        return false;
+    }
+
+    /*
+     * Confirm that the substring ends at either a directory separator
+     * or the end of string  (so exact mount points also match).
+     *
+     * For instance consider a virtual_mountpt of /mnt/abc and searching
+     * for target=/mnt/abcd - this should return false in that case.
+     */
+    return (target[mplen] == '/' || target[mplen] == 0);
 } /* end OS_FileSys_FindVirtMountPoint */
 
 /*----------------------------------------------------------------
diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c
index 1e2496662..f902a9fb7 100644
--- a/src/os/shared/src/osapi-idmap.c
+++ b/src/os/shared/src/osapi-idmap.c
@@ -1103,7 +1103,7 @@ int32 OS_ObjectIdGetById(OS_lock_mode_t lock_mode, osal_objtype_t idtype, osal_i
  * be changed.
  *
  *-----------------------------------------------------------------*/
-void OS_ObjectIdTransactionFinish(OS_object_token_t *token, osal_id_t *final_id)
+void OS_ObjectIdTransactionFinish(OS_object_token_t *token, const osal_id_t *final_id)
 {
     OS_common_record_t *record;
 
diff --git a/src/os/shared/src/osapi-module.c b/src/os/shared/src/osapi-module.c
index fd24962d1..23ddc0126 100644
--- a/src/os/shared/src/osapi-module.c
+++ b/src/os/shared/src/osapi-module.c
@@ -48,10 +48,7 @@
 
 /*
  * Sanity checks on the user-supplied configuration
- * The relevent OS_MAX limit should be defined
- *
- * OS_MAX_MODULES is allowed to be zero in which case the
- * table is not instantiated.
+ * The relevent OS_MAX limit should be defined and greater than zero
  */
 #if !defined(OS_MAX_MODULES) || (OS_MAX_MODULES <= 0)
 #error "osconfig.h must define OS_MAX_MODULES to a valid value"
diff --git a/src/os/shared/src/osapi-mutex.c b/src/os/shared/src/osapi-mutex.c
index 93cc0e92f..fb07100cd 100644
--- a/src/os/shared/src/osapi-mutex.c
+++ b/src/os/shared/src/osapi-mutex.c
@@ -198,7 +198,6 @@ int32 OS_MutSemTake(osal_id_t sem_id)
     OS_mutex_internal_record_t *mutex;
     OS_object_token_t           token;
     int32                       return_code;
-    osal_id_t                   self_task;
 
     /* Check Parameters */
     return_code = OS_ObjectIdGetById(OS_LOCK_MODE_NONE, LOCAL_OBJID_TYPE, sem_id, &token);
@@ -209,16 +208,8 @@ int32 OS_MutSemTake(osal_id_t sem_id)
         return_code = OS_MutSemTake_Impl(&token);
         if (return_code == OS_SUCCESS)
         {
-            self_task = OS_TaskGetId();
-
-            if (OS_ObjectIdDefined(mutex->last_owner))
-            {
-                OS_DEBUG("WARNING: Task %lu taking mutex %lu while owned by task %lu\n",
-                         OS_ObjectIdToInteger(self_task), OS_ObjectIdToInteger(sem_id),
-                         OS_ObjectIdToInteger(mutex->last_owner));
-            }
-
-            mutex->last_owner = self_task;
+            /* Always set the owner if OS_MutSemTake_Impl() returned success */
+            mutex->last_owner = OS_TaskGetId();
         }
     }
 
diff --git a/src/os/shared/src/osapi-version.c b/src/os/shared/src/osapi-version.c
index 610d1a6a4..d20d3101a 100644
--- a/src/os/shared/src/osapi-version.c
+++ b/src/os/shared/src/osapi-version.c
@@ -29,7 +29,7 @@
 /****************************************************************************************
                                     INCLUDE FILES
  ***************************************************************************************/
-#include <osapi-version.h>
+#include "osapi-version.h"
 
 /*----------------------------------------------------------------
  *
diff --git a/src/os/vxworks/inc/os-vxworks.h b/src/os/vxworks/inc/os-vxworks.h
index da6b8da22..5c6cd95f0 100644
--- a/src/os/vxworks/inc/os-vxworks.h
+++ b/src/os/vxworks/inc/os-vxworks.h
@@ -41,7 +41,7 @@
 #include <semLib.h>
 #include <errnoLib.h>
 
-#include <os-shared-globaldefs.h>
+#include "os-shared-globaldefs.h"
 
 /****************************************************************************************
                                      DEFINES
diff --git a/src/os/vxworks/src/os-impl-loader.c b/src/os/vxworks/src/os-impl-loader.c
index 49e693be4..2e0ef53ce 100644
--- a/src/os/vxworks/src/os-impl-loader.c
+++ b/src/os/vxworks/src/os-impl-loader.c
@@ -164,6 +164,7 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo
     MODULE_INFO                       vxModuleInfo;
     STATUS                            vxStatus;
     OS_impl_module_internal_record_t *impl;
+    int32                             return_code;
 
     impl = OS_OBJECT_TABLE_GET(OS_impl_module_table, *token);
 
@@ -176,6 +177,7 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo
     if (vxStatus == ERROR)
     {
         OS_DEBUG("OSAL: OS_ModuleInfoGet Error from vxWorks: %d\n", vxStatus);
+        return_code = OS_ERROR;
     }
     else
     {
@@ -186,8 +188,10 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo
         module_prop->addr.data_size    = vxModuleInfo.segInfo.dataSize;
         module_prop->addr.bss_address  = (cpuaddr)vxModuleInfo.segInfo.bssAddr;
         module_prop->addr.bss_size     = vxModuleInfo.segInfo.bssSize;
+
+        return_code = OS_SUCCESS;
     }
 
-    return (OS_SUCCESS);
+    return (return_code);
 
 } /* end OS_ModuleGetInfo_Impl */
diff --git a/src/os/vxworks/src/os-impl-timebase.c b/src/os/vxworks/src/os-impl-timebase.c
index b390f15f2..58e3d303d 100644
--- a/src/os/vxworks/src/os-impl-timebase.c
+++ b/src/os/vxworks/src/os-impl-timebase.c
@@ -546,8 +546,6 @@ int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uin
 
         if (status == OK)
         {
-            return_code = OS_SUCCESS;
-
             /*
              * VxWorks will round the interval up to the next higher
              * system tick interval.  Sometimes this can make a substantial
@@ -565,6 +563,8 @@ int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uin
             status = timer_gettime(local->host_timerid, &timeout);
             if (status == OK)
             {
+                return_code = OS_SUCCESS;
+
                 local->configured_start_time = (timeout.it_value.tv_sec * 1000000) + (timeout.it_value.tv_nsec / 1000);
                 local->configured_interval_time =
                     (timeout.it_interval.tv_sec * 1000000) + (timeout.it_interval.tv_nsec / 1000);
@@ -582,6 +582,13 @@ int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uin
                              (unsigned long)local->configured_interval_time);
                 }
             }
+            else
+            {
+                return_code = OS_ERROR;
+
+                OS_DEBUG("WARNING: timer %lu timer_gettime() failed - timer not configured properly?\n",
+                         OS_ObjectIdToInteger(OS_ObjectIdFromToken(token)));
+            }
         }
         else
         {
diff --git a/src/tests/file-api-test/file-api-test.c b/src/tests/file-api-test/file-api-test.c
index bfdf0b88f..7a1f7de7f 100644
--- a/src/tests/file-api-test/file-api-test.c
+++ b/src/tests/file-api-test/file-api-test.c
@@ -274,7 +274,7 @@ void TestChmod(void)
     }
     else
     {
-        UtPrintf("OS_chmod not implemented for write only\n");
+        UtAssert_NA("OS_chmod not implemented for write only");
     }
 
     /*Testing Read Only */
@@ -289,7 +289,7 @@ void TestChmod(void)
     }
     else
     {
-        UtPrintf("OS_chmod not implemented for read only\n");
+        UtAssert_NA("OS_chmod not implemented for read only");
     }
 
     /*Testing Read Write */
@@ -304,7 +304,7 @@ void TestChmod(void)
     }
     else
     {
-        UtPrintf("OS_chmod not implemented for read write\n");
+        UtAssert_NA("OS_chmod not implemented for read write");
     }
 
     /*Removing the file */
diff --git a/src/tests/network-api-test/network-api-test.c b/src/tests/network-api-test/network-api-test.c
index ef2dfb3ab..6e53a42ad 100644
--- a/src/tests/network-api-test/network-api-test.c
+++ b/src/tests/network-api-test/network-api-test.c
@@ -122,7 +122,7 @@ void TestDatagramNetworkApi_Setup(void)
         actual = OS_SocketOpen(&socket_id, OS_SocketDomain_INET6, OS_SocketType_DATAGRAM);
         if (actual == OS_ERR_NOT_IMPLEMENTED)
         {
-            UtPrintf("INET6 not supported\n");
+            UtAssert_NA("INET6 not supported");
         }
         else
         {
@@ -142,7 +142,7 @@ void TestDatagramNetworkApi_Setup(void)
         actual = OS_SocketAddrInit(&addr, OS_SocketDomain_INET6);
         if (actual == OS_ERR_NOT_IMPLEMENTED)
         {
-            UtPrintf("INET6 not supported\n");
+            UtAssert_NA("INET6 not supported");
         }
         else
         {
@@ -152,7 +152,7 @@ void TestDatagramNetworkApi_Setup(void)
         actual = OS_SocketAddrInit(NULL, OS_SocketDomain_INET6);
         if (actual == OS_ERR_NOT_IMPLEMENTED)
         {
-            UtPrintf("INET6 not supported\n");
+            UtAssert_NA("INET6 not supported");
         }
         else
         {
@@ -378,7 +378,7 @@ void TestDatagramNetworkApi(void)
     }
     else
     {
-        UtAssert_Type(NA, false, "Network API not implemented");
+        UtAssert_NA("Network API not implemented");
     }
 
 } /* end TestDatagramNetworkApi */
@@ -466,7 +466,7 @@ void TestStreamNetworkApi(void)
     actual      = OS_SocketOpen(&s_socket_id, OS_SocketDomain_INET, OS_SocketType_STREAM);
     if (actual == OS_ERR_NOT_IMPLEMENTED)
     {
-        UtAssert_Type(NA, false, "Network API not implemented");
+        UtAssert_NA("Network API not implemented");
     }
     else
     {
diff --git a/src/tests/select-test/select-test.c b/src/tests/select-test/select-test.c
index 960bd7440..84b213964 100644
--- a/src/tests/select-test/select-test.c
+++ b/src/tests/select-test/select-test.c
@@ -338,7 +338,7 @@ void TestSelectSingleRead(void)
     }
     else
     {
-        UtAssert_Type(NA, false, "Network API not implemented");
+        UtAssert_NA("Network API not implemented");
     }
 }
 
@@ -396,7 +396,7 @@ void TestSelectMultipleRead(void)
     }
     else
     {
-        UtAssert_Type(NA, false, "Network API not implemented");
+        UtAssert_NA("Network API not implemented");
     }
 }
 
@@ -467,7 +467,7 @@ void TestSelectSingleWrite(void)
     }
     else
     {
-        UtAssert_Type(NA, false, "Network API not implemented");
+        UtAssert_NA("Network API not implemented");
     }
 }
 
@@ -548,7 +548,7 @@ void TestSelectMultipleWrite(void)
     }
     else
     {
-        UtAssert_Type(NA, false, "Network API not implemented");
+        UtAssert_NA("Network API not implemented");
     }
 }
 
diff --git a/src/tests/shell-test/shell-test.c b/src/tests/shell-test/shell-test.c
new file mode 100644
index 000000000..f05ff0f9f
--- /dev/null
+++ b/src/tests/shell-test/shell-test.c
@@ -0,0 +1,108 @@
+/*
+ *  NASA Docket No. GSC-18,370-1, and identified as "Operating System Abstraction Layer"
+ *
+ *  Copyright (c) 2019 United States Government as represented by
+ *  the Administrator of the National Aeronautics and Space Administration.
+ *  All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "common_types.h"
+#include "osapi.h"
+#include "utassert.h"
+#include "uttest.h"
+#include "utbsp.h"
+
+#define OS_TEST_SHELL_FILENAME "/drive0/shell_test.txt"
+
+/* *************************************** MAIN ************************************** */
+
+void TestOutputToFile(void)
+{
+    char      cmd[33];
+    char      filename[OS_MAX_PATH_LEN];
+    char      buffer[21];
+    char      copyofbuffer[21];
+    size_t    size;
+    int32     status;
+    osal_id_t fd;
+
+    OS_mkfs(NULL, "/ramdev0", "RAM", 512, 20);
+    OS_mount("/ramdev0", "/drive0");
+
+    strncpy(filename, "/drive0/Filename1", sizeof(filename) - 1);
+    filename[sizeof(filename) - 1] = 0;
+
+    strcpy(buffer, "ValueToEchoInTheFile");
+    strcpy(copyofbuffer, buffer); /* hold a copy of the buffer */
+
+    /* Open In R/W mode */
+    status = OS_OpenCreate(&fd, OS_TEST_SHELL_FILENAME, OS_FILE_FLAG_CREATE, OS_READ_WRITE);
+    UtAssert_True(status >= OS_SUCCESS, "status after creat = %d", (int)status);
+
+    /* Write the string */
+    size = strlen(buffer);
+
+    snprintf(cmd, sizeof(cmd), "echo -n \"%s\"", buffer);
+
+    status = OS_ShellOutputToFile(cmd, fd);
+    if (status == OS_ERR_NOT_IMPLEMENTED)
+    {
+        UtAssert_NA("Shell Commands not implemented");
+    }
+    else
+    {
+        UtAssert_True(status >= OS_SUCCESS, "status after shell output to file = %d", (int)status);
+
+        strcpy(buffer, "");
+
+        /* lseek back to the beginning of the file */
+        status = OS_lseek(fd, 0, 0);
+        UtAssert_True(status >= OS_SUCCESS, "status after lseek = %d", (int)status);
+
+        /*Read what we wrote to the file */
+        status = OS_read(fd, (void *)buffer, size);
+        UtAssert_True(status == size, "status after read = %d size = %lu", (int)status, (unsigned long)size);
+        if (status >= OS_SUCCESS)
+        {
+            UtAssert_True(strcmp(buffer, copyofbuffer) == 0, "Read: %s, Written: %s", buffer, copyofbuffer);
+        }
+    }
+
+    /* close the file */
+    status = OS_close(fd);
+    UtAssert_True(status == OS_SUCCESS, "status after close = %d", (int)status);
+
+    /* try removing the file from the drive */
+    status = OS_remove(OS_TEST_SHELL_FILENAME);
+    UtAssert_True(status == OS_SUCCESS, "status after remove = %d", (int)status);
+
+} /* end TestOutputToFile */
+
+void UtTest_Setup(void)
+{
+    if (OS_API_Init() != OS_SUCCESS)
+    {
+        UtAssert_Abort("OS_API_Init() failed");
+    }
+
+    /*
+     * Register the test setup and check routines in UT assert
+     */
+    UtTest_Add(TestOutputToFile, NULL, NULL, "ShellTest");
+}
diff --git a/src/tests/symbol-api-test/symbol-api-test.c b/src/tests/symbol-api-test/symbol-api-test.c
index ee2002645..60f5a767c 100644
--- a/src/tests/symbol-api-test/symbol-api-test.c
+++ b/src/tests/symbol-api-test/symbol-api-test.c
@@ -48,24 +48,42 @@ void TestSymbolApi(void)
     */
     UtPrintf("Dumping symbol table with a limit of 32768 bytes\n");
     status = OS_SymbolTableDump("/ram/SymbolTable32k.dat", 32768);
-    UtAssert_True(status == OS_SUCCESS || status == OS_ERR_NOT_IMPLEMENTED, "status after 32k OS_SymbolTableDump = %d",
-                  (int)status);
+    if (status == OS_ERR_NOT_IMPLEMENTED)
+    {
+        UtAssert_NA("Module API not implemented");
+    }
+    else
+    {
+        UtAssert_True(status == OS_SUCCESS, "status after 32k OS_SymbolTableDump = %d", (int)status);
+    }
 
     /*
     ** dump the symbol table with a 128k byte limit
     */
     UtPrintf("Dumping symbol table with a limit of 131072 bytes\n");
     status = OS_SymbolTableDump("/ram/SymbolTable128k.dat", 131072);
-    UtAssert_True(status == OS_SUCCESS || status == OS_ERR_NOT_IMPLEMENTED, "status after 128k OS_SymbolTableDump = %d",
-                  (int)status);
+    if (status == OS_ERR_NOT_IMPLEMENTED)
+    {
+        UtAssert_NA("Module API not implemented");
+    }
+    else
+    {
+        UtAssert_True(status == OS_SUCCESS, "status after 128k OS_SymbolTableDump = %d", (int)status);
+    }
 
     /*
     ** dump the symbol table with a 512k byte limit
     */
     UtPrintf("Dumping symbol table with a limit of 524288 bytes\n");
     status = OS_SymbolTableDump("/ram/SymbolTable512k.dat", 524288);
-    UtAssert_True(status == OS_SUCCESS || status == OS_ERR_NOT_IMPLEMENTED, "status after 512k OS_SymbolTableDump = %d",
-                  (int)status);
+    if (status == OS_ERR_NOT_IMPLEMENTED)
+    {
+        UtAssert_NA("Module API not implemented");
+    }
+    else
+    {
+        UtAssert_True(status == OS_SUCCESS, "status after 512k OS_SymbolTableDump = %d", (int)status);
+    }
 
     /*
     ** Test the symbol lookup
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 a405b68af..4e7d87b09 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
@@ -29,7 +29,7 @@
 #define UT_ADAPTOR_PORTABLE_POSIX_FILES_H
 
 #include "common_types.h"
-#include <OCS_sys_types.h>
+#include "OCS_sys_types.h"
 
 OCS_uid_t UT_PortablePosixFileTest_GetSelfEUID(void);
 OCS_gid_t UT_PortablePosixFileTest_GetSelfEGID(void);
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 a4cadae82..5acb4ff73 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
@@ -39,5 +39,6 @@
  *
  *****************************************************/
 void UT_PortablePosixIOTest_Set_Selectable(osal_index_t local_id, bool is_selectable);
+void UT_PortablePosixIOTest_Set_FD(osal_index_t local_id, int fd);
 
 #endif /* UT_ADAPTOR_PORTABLE_POSIX_IO_H  */
diff --git a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c
index e7a5bc79d..31456820a 100644
--- a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c
+++ b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c
@@ -29,7 +29,7 @@
 #include "osconfig.h"
 #include "ut-adaptor-portable-posix-files.h"
 
-#include <os-impl-files.h>
+#include "os-impl-files.h"
 
 OCS_uid_t UT_PortablePosixFileTest_GetSelfEUID(void)
 {
diff --git a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c
index dea9b84d5..060c6b595 100644
--- a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c
+++ b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c
@@ -29,9 +29,14 @@
 #include "osconfig.h"
 #include "ut-adaptor-portable-posix-io.h"
 
-#include <os-impl-io.h>
+#include "os-impl-io.h"
 
 void UT_PortablePosixIOTest_Set_Selectable(osal_index_t local_id, bool is_selectable)
 {
     OS_impl_filehandle_table[local_id].selectable = is_selectable;
 }
+
+void UT_PortablePosixIOTest_Set_FD(osal_index_t local_id, int fd)
+{
+    OS_impl_filehandle_table[local_id].fd = fd;
+}
diff --git a/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c b/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
index fd2f7951c..eb88520c4 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
@@ -28,7 +28,8 @@
 #include "os-shared-select.h"
 #include "os-shared-idmap.h"
 
-#include <OCS_sys_select.h>
+#include "OCS_sys_select.h"
+#include "OCS_errno.h"
 
 void Test_OS_SelectSingle_Impl(void)
 {
@@ -39,6 +40,7 @@ void Test_OS_SelectSingle_Impl(void)
     OS_object_token_t   token;
     struct OCS_timespec nowtime;
     struct OCS_timespec latertime;
+    struct OCS_timespec latertime2;
 
     memset(&token, 0, sizeof(token));
 
@@ -52,6 +54,23 @@ void Test_OS_SelectSingle_Impl(void)
     SelectFlags = 0;
     OSAPI_TEST_FUNCTION_RC(OS_SelectSingle_Impl, (&token, &SelectFlags, 0), OS_SUCCESS);
 
+    /* try a case where select() needs to be repeated to achieve the desired wait time */
+    UT_SetDefaultReturnValue(UT_KEY(OCS_select), -1);
+    OCS_errno = OCS_EINTR;
+    UT_SetDeferredRetcode(UT_KEY(OCS_select), 2, 0);
+    SelectFlags        = OS_STREAM_STATE_READABLE | OS_STREAM_STATE_WRITABLE;
+    nowtime.tv_sec     = 1;
+    nowtime.tv_nsec    = 0;
+    latertime.tv_sec   = 1;
+    latertime.tv_nsec  = 800000000;
+    latertime2.tv_sec  = 2;
+    latertime2.tv_nsec = 200000000;
+    UT_SetDataBuffer(UT_KEY(OCS_clock_gettime), &nowtime, sizeof(nowtime), false);
+    UT_SetDataBuffer(UT_KEY(OCS_clock_gettime), &nowtime, sizeof(nowtime), false);
+    UT_SetDataBuffer(UT_KEY(OCS_clock_gettime), &latertime, sizeof(latertime), false);
+    UT_SetDataBuffer(UT_KEY(OCS_clock_gettime), &latertime2, sizeof(latertime2), false);
+    OSAPI_TEST_FUNCTION_RC(OS_SelectSingle_Impl, (&token, &SelectFlags, 1200), OS_ERROR_TIMEOUT);
+
     UT_SetDefaultReturnValue(UT_KEY(OCS_select), 0);
     SelectFlags       = OS_STREAM_STATE_READABLE | OS_STREAM_STATE_WRITABLE;
     nowtime.tv_sec    = 1;
@@ -63,6 +82,7 @@ void Test_OS_SelectSingle_Impl(void)
     OSAPI_TEST_FUNCTION_RC(OS_SelectSingle_Impl, (&token, &SelectFlags, 999), OS_ERROR_TIMEOUT);
 
     UT_SetDefaultReturnValue(UT_KEY(OCS_select), -1);
+    OCS_errno         = OCS_ETIMEDOUT;
     SelectFlags       = OS_STREAM_STATE_READABLE | OS_STREAM_STATE_WRITABLE;
     nowtime.tv_sec    = 1;
     nowtime.tv_nsec   = 0;
@@ -71,6 +91,13 @@ void Test_OS_SelectSingle_Impl(void)
     UT_SetDataBuffer(UT_KEY(OCS_clock_gettime), &nowtime, sizeof(nowtime), false);
     UT_SetDataBuffer(UT_KEY(OCS_clock_gettime), &latertime, sizeof(latertime), false);
     OSAPI_TEST_FUNCTION_RC(OS_SelectSingle_Impl, (&token, &SelectFlags, 2100), OS_ERROR);
+
+    /* Test cases where the FD exceeds FD_SETSIZE */
+    SelectFlags = OS_STREAM_STATE_READABLE | OS_STREAM_STATE_WRITABLE;
+    UT_PortablePosixIOTest_Set_FD(UT_INDEX_0, OCS_FD_SETSIZE);
+    UT_PortablePosixIOTest_Set_Selectable(UT_INDEX_0, true);
+    OSAPI_TEST_FUNCTION_RC(OS_SelectSingle_Impl, (&token, &SelectFlags, 0), OS_ERR_OPERATION_NOT_SUPPORTED);
+
 } /* end OS_SelectSingle_Impl */
 
 void Test_OS_SelectMultiple_Impl(void)
@@ -81,13 +108,44 @@ void Test_OS_SelectMultiple_Impl(void)
     OS_FdSet ReadSet;
     OS_FdSet WriteSet;
 
+    UT_PortablePosixIOTest_Set_FD(UT_INDEX_0, 0);
+    UT_PortablePosixIOTest_Set_Selectable(UT_INDEX_0, true);
+
     memset(&ReadSet, 0, sizeof(ReadSet));
-    memset(&WriteSet, 0xff, sizeof(WriteSet));
+    memset(&WriteSet, 0, sizeof(WriteSet));
+    WriteSet.object_ids[0] = 1;
     OSAPI_TEST_FUNCTION_RC(OS_SelectMultiple_Impl, (&ReadSet, &WriteSet, 0), OS_SUCCESS);
-    memset(&ReadSet, 0xff, sizeof(ReadSet));
+
+    memset(&ReadSet, 0, sizeof(ReadSet));
     memset(&WriteSet, 0, sizeof(WriteSet));
+    ReadSet.object_ids[0] = 1;
     UT_SetDefaultReturnValue(UT_KEY(OCS_select), 0);
     OSAPI_TEST_FUNCTION_RC(OS_SelectMultiple_Impl, (&ReadSet, &WriteSet, 1), OS_ERROR_TIMEOUT);
+
+    /* Test where the FD set is empty */
+    memset(&ReadSet, 0, sizeof(ReadSet));
+    memset(&WriteSet, 0, sizeof(WriteSet));
+    OSAPI_TEST_FUNCTION_RC(OS_SelectMultiple_Impl, (NULL, NULL, 0), OS_ERR_INVALID_ID);
+
+    /* Test cases where the FD exceeds FD_SETSIZE in the read set */
+    UT_PortablePosixIOTest_Set_FD(UT_INDEX_0, OCS_FD_SETSIZE);
+    UT_PortablePosixIOTest_Set_Selectable(UT_INDEX_0, true);
+    memset(&ReadSet, 0xff, sizeof(ReadSet));
+    memset(&WriteSet, 0, sizeof(WriteSet));
+    OSAPI_TEST_FUNCTION_RC(OS_SelectMultiple_Impl, (&ReadSet, &WriteSet, 0), OS_ERR_OPERATION_NOT_SUPPORTED);
+
+    /* Test cases where the FD exceeds FD_SETSIZE in the write set */
+    memset(&ReadSet, 0, sizeof(ReadSet));
+    memset(&WriteSet, 0xff, sizeof(WriteSet));
+    OSAPI_TEST_FUNCTION_RC(OS_SelectMultiple_Impl, (&ReadSet, &WriteSet, 0), OS_ERR_OPERATION_NOT_SUPPORTED);
+
+    /* Test cases where additional bits are set in the OS_FdSet */
+    UT_PortablePosixIOTest_Set_FD(UT_INDEX_0, 0);
+    UT_PortablePosixIOTest_Set_Selectable(UT_INDEX_0, true);
+    memset(&ReadSet, 0xff, sizeof(ReadSet));
+    memset(&WriteSet, 0xff, sizeof(WriteSet));
+    OSAPI_TEST_FUNCTION_RC(OS_SelectMultiple_Impl, (&ReadSet, &WriteSet, 0), OS_ERR_OPERATION_NOT_SUPPORTED);
+
 } /* end OS_SelectMultiple_Impl */
 
 /* ------------------- End of test cases --------------------------------------*/
diff --git a/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c b/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c
index 51727f590..7c8e9aba2 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c
@@ -29,8 +29,8 @@
 #include "os-shared-printf.h"
 #include "os-shared-idmap.h"
 
-#include <OCS_stdio.h>
-#include <OCS_bsp-impl.h>
+#include "OCS_stdio.h"
+#include "OCS_bsp-impl.h"
 
 #define TEST_BUFFER_LEN 16
 
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c b/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
index 17d581fcd..d3149bc60 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
@@ -29,12 +29,12 @@
 #include "os-shared-dir.h"
 #include "os-shared-idmap.h"
 
-#include <OCS_stdlib.h>
-#include <OCS_dirent.h>
-#include <OCS_unistd.h>
-#include <OCS_fcntl.h>
-#include <OCS_stat.h>
-#include <OCS_errno.h>
+#include "OCS_stdlib.h"
+#include "OCS_dirent.h"
+#include "OCS_unistd.h"
+#include "OCS_fcntl.h"
+#include "OCS_stat.h"
+#include "OCS_errno.h"
 
 void Test_OS_DirCreate_Impl(void)
 {
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-files.c b/src/unit-test-coverage/portable/src/coveragetest-posix-files.c
index 28a03e849..964348888 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-files.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-files.c
@@ -30,12 +30,12 @@
 #include "os-shared-file.h"
 #include "os-shared-idmap.h"
 
-#include <OCS_stdio.h>
-#include <OCS_stdlib.h>
-#include <OCS_unistd.h>
-#include <OCS_fcntl.h>
-#include <OCS_stat.h>
-#include <OCS_errno.h>
+#include "OCS_stdio.h"
+#include "OCS_stdlib.h"
+#include "OCS_unistd.h"
+#include "OCS_fcntl.h"
+#include "OCS_stat.h"
+#include "OCS_errno.h"
 
 void Test_OS_FileOpen_Impl(void)
 {
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c b/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c
index e69cb830a..f59717757 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c
@@ -27,7 +27,7 @@
 #include "os-portable-coveragetest.h"
 #include "os-shared-clock.h"
 
-#include <OCS_time.h>
+#include "OCS_time.h"
 
 void Test_OS_GetLocalTime_Impl(void)
 {
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-io.c b/src/unit-test-coverage/portable/src/coveragetest-posix-io.c
index f3c7ea87b..a4cca4fd0 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-io.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-io.c
@@ -32,10 +32,10 @@
 #include "os-shared-idmap.h"
 #include "os-shared-select.h"
 
-#include <OCS_stdlib.h>
-#include <OCS_unistd.h>
-#include <OCS_fcntl.h>
-#include <OCS_errno.h>
+#include "OCS_stdlib.h"
+#include "OCS_unistd.h"
+#include "OCS_fcntl.h"
+#include "OCS_errno.h"
 
 void Test_OS_GenericClose_Impl(void)
 {
@@ -84,7 +84,7 @@ void Test_OS_GenericSeek_Impl(void)
 
     /* The seek implementation also checks for this specific pipe errno */
     OCS_errno = OCS_ESPIPE;
-    OSAPI_TEST_FUNCTION_RC(OS_GenericSeek_Impl, (&token, 0, OS_SEEK_END), OS_ERR_NOT_IMPLEMENTED);
+    OSAPI_TEST_FUNCTION_RC(OS_GenericSeek_Impl, (&token, 0, OS_SEEK_END), OS_ERR_OPERATION_NOT_SUPPORTED);
 }
 
 void Test_OS_GenericRead_Impl(void)
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 ce017dd0a..eb946dff0 100644
--- a/src/unit-test-coverage/portable/src/os-portable-coveragetest.h
+++ b/src/unit-test-coverage/portable/src/os-portable-coveragetest.h
@@ -32,9 +32,9 @@
  * Includes
  */
 
-#include <utassert.h>
-#include <uttest.h>
-#include <utstubs.h>
+#include "utassert.h"
+#include "uttest.h"
+#include "utstubs.h"
 
 #include "os-shared-globaldefs.h"
 
diff --git a/src/unit-test-coverage/shared/src/coveragetest-binsem.c b/src/unit-test-coverage/shared/src/coveragetest-binsem.c
index 37bfcd920..8619b59d1 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-binsem.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-binsem.c
@@ -27,7 +27,7 @@
 #include "os-shared-coveragetest.h"
 #include "os-shared-binsem.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /*
 **********************************************************************************
diff --git a/src/unit-test-coverage/shared/src/coveragetest-common.c b/src/unit-test-coverage/shared/src/coveragetest-common.c
index f760641bd..479105e2d 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-common.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-common.c
@@ -29,7 +29,7 @@
 #include "os-shared-task.h"
 #include "os-shared-timebase.h"
 
-#include <OCS_stdlib.h>
+#include "OCS_stdlib.h"
 
 /*
 ** OS_CleanUpObject() is an internal helper function.
diff --git a/src/unit-test-coverage/shared/src/coveragetest-countsem.c b/src/unit-test-coverage/shared/src/coveragetest-countsem.c
index f4d9fae62..46612a774 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-countsem.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-countsem.c
@@ -27,7 +27,7 @@
 #include "os-shared-coveragetest.h"
 #include "os-shared-countsem.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /*
 **********************************************************************************
diff --git a/src/unit-test-coverage/shared/src/coveragetest-file.c b/src/unit-test-coverage/shared/src/coveragetest-file.c
index 3729b54b1..d4cafaeb1 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-file.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-file.c
@@ -28,7 +28,7 @@
 #include "os-shared-file.h"
 #include "os-shared-idmap.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /*
 **********************************************************************************
diff --git a/src/unit-test-coverage/shared/src/coveragetest-filesys.c b/src/unit-test-coverage/shared/src/coveragetest-filesys.c
index ce24aabc7..d70381573 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-filesys.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-filesys.c
@@ -27,7 +27,7 @@
 #include "os-shared-coveragetest.h"
 #include "os-shared-filesys.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /*
 **********************************************************************************
diff --git a/src/unit-test-coverage/shared/src/coveragetest-idmap.c b/src/unit-test-coverage/shared/src/coveragetest-idmap.c
index 00834d784..83590c08b 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-idmap.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-idmap.c
@@ -29,7 +29,7 @@
 #include "os-shared-common.h"
 #include "os-shared-task.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 typedef struct
 {
diff --git a/src/unit-test-coverage/shared/src/coveragetest-module.c b/src/unit-test-coverage/shared/src/coveragetest-module.c
index 2552626bb..e1e3d8a1d 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-module.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-module.c
@@ -29,7 +29,7 @@
 
 #include "os-shared-module.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /* A dummy function for the static symbol lookup test.  Not called */
 void Test_DummyFunc(void) {}
diff --git a/src/unit-test-coverage/shared/src/coveragetest-mutex.c b/src/unit-test-coverage/shared/src/coveragetest-mutex.c
index d5a5158d1..00776a4f3 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-mutex.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-mutex.c
@@ -27,7 +27,7 @@
 #include "os-shared-coveragetest.h"
 #include "os-shared-mutex.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /*
 **********************************************************************************
diff --git a/src/unit-test-coverage/shared/src/coveragetest-printf.c b/src/unit-test-coverage/shared/src/coveragetest-printf.c
index 44f7f7586..e27780d1d 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-printf.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-printf.c
@@ -28,7 +28,7 @@
 #include "os-shared-printf.h"
 #include "os-shared-common.h"
 
-#include <OCS_stdio.h>
+#include "OCS_stdio.h"
 
 char TestConsoleBuffer[16];
 
diff --git a/src/unit-test-coverage/shared/src/coveragetest-queue.c b/src/unit-test-coverage/shared/src/coveragetest-queue.c
index 44dab954f..a9493e87f 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-queue.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-queue.c
@@ -27,7 +27,7 @@
 #include "os-shared-coveragetest.h"
 #include "os-shared-queue.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /*
 **********************************************************************************
diff --git a/src/unit-test-coverage/shared/src/coveragetest-select.c b/src/unit-test-coverage/shared/src/coveragetest-select.c
index 34d81579e..e5c848257 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-select.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-select.c
@@ -27,7 +27,7 @@
 #include "os-shared-coveragetest.h"
 #include "os-shared-select.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /*
 **********************************************************************************
diff --git a/src/unit-test-coverage/shared/src/coveragetest-sockets.c b/src/unit-test-coverage/shared/src/coveragetest-sockets.c
index 6981bfca0..ea73c12b9 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-sockets.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-sockets.c
@@ -29,7 +29,7 @@
 #include "os-shared-idmap.h"
 #include "os-shared-file.h"
 
-#include <OCS_stdio.h>
+#include "OCS_stdio.h"
 
 void Test_OS_SocketAPI_Init(void)
 {
diff --git a/src/unit-test-coverage/shared/src/coveragetest-task.c b/src/unit-test-coverage/shared/src/coveragetest-task.c
index a97af4301..ae1035d24 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-task.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-task.c
@@ -27,7 +27,7 @@
 #include "os-shared-coveragetest.h"
 #include "os-shared-task.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 static uint32 UT_TestHook_Count = 0;
 
diff --git a/src/unit-test-coverage/shared/src/coveragetest-time.c b/src/unit-test-coverage/shared/src/coveragetest-time.c
index 9e90abcc5..1911196e3 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-time.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-time.c
@@ -29,7 +29,7 @@
 #include "os-shared-timebase.h"
 #include "os-shared-task.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 static uint32 UT_TimerCount    = 0;
 static uint32 UT_TimerArgCount = 0;
diff --git a/src/unit-test-coverage/shared/src/coveragetest-timebase.c b/src/unit-test-coverage/shared/src/coveragetest-timebase.c
index 52489b730..fbfb10d35 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-timebase.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-timebase.c
@@ -31,7 +31,7 @@
 #include "os-shared-task.h"
 #include "os-shared-common.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 #include <limits.h>
 
 static uint32 TimerSyncCount  = 0;
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 bfefc17d0..21b0a3d7d 100644
--- a/src/unit-test-coverage/shared/src/os-shared-coveragetest.h
+++ b/src/unit-test-coverage/shared/src/os-shared-coveragetest.h
@@ -28,9 +28,9 @@
 #ifndef OS_SHARED_COVERAGETEST_H
 #define OS_SHARED_COVERAGETEST_H
 
-#include <utassert.h>
-#include <uttest.h>
-#include <utstubs.h>
+#include "utassert.h"
+#include "uttest.h"
+#include "utstubs.h"
 #include "osapi.h"
 
 #include "os-shared-idmap.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 77128e614..d244aa10f 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
@@ -22,7 +22,7 @@
 #ifndef OCS_ARPA_INET_H
 #define OCS_ARPA_INET_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 fc23e44d3..841e81efc 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_assert.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_assert.h
@@ -22,7 +22,7 @@
 #ifndef OCS_ASSERT_H
 #define OCS_ASSERT_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in assert.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 8816c7f42..5348636f3 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_blkIo.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_blkIo.h
@@ -22,8 +22,8 @@
 #ifndef OCS_BLKIO_H
 #define OCS_BLKIO_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* The module and blk_dev types are used in several headers */
 typedef struct OCS_BLK_DEV
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 f0a285402..ea24e37d1 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
@@ -45,7 +45,7 @@
 #ifndef OCS_BSP_IMPL_H
 #define OCS_BSP_IMPL_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 #define OCS_OS_BSP_CONSOLEMODE_NORMAL    0x2101
 #define OCS_OS_BSP_CONSOLEMODE_RED       0x2102
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 cfabf811b..89717782a 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_cbioLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_cbioLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_CBIOLIB_H
 #define OCS_CBIOLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 2e68e379d..c9d81ef55 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_complex.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_complex.h
@@ -22,7 +22,7 @@
 #ifndef OCS_COMPLEX_H
 #define OCS_COMPLEX_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 f68aa8b0b..b4e091fdf 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ctype.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ctype.h
@@ -22,7 +22,7 @@
 #ifndef OCS_CTYPE_H
 #define OCS_CTYPE_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 af9ce8418..bf88e5c04 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_dirent.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_dirent.h
@@ -22,7 +22,7 @@
 #ifndef OCS_DIRENT_H
 #define OCS_DIRENT_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 fe8934a17..1d3fdb3cd 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_dlfcn.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_dlfcn.h
@@ -22,7 +22,7 @@
 #ifndef OCS_DLFCN_H
 #define OCS_DLFCN_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 1f783ecf2..74447deb5 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_dosFsLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_dosFsLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_DOSFSLIB_H
 #define OCS_DOSFSLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 65c63d700..c7735acb9 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
@@ -22,9 +22,9 @@
 #ifndef OCS_DRV_HDISK_ATADRV_H
 #define OCS_DRV_HDISK_ATADRV_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
-#include <OCS_blkIo.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
+#include "OCS_blkIo.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 79c123e0d..e13aa3083 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_errno.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_errno.h
@@ -22,7 +22,7 @@
 #ifndef OCS_ERRNO_H
 #define OCS_ERRNO_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 73b0c2039..738bc81e3 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_errnoLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_errnoLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_ERRNOLIB_H
 #define OCS_ERRNOLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 b1ab963f9..1c9e9b398 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_fcntl.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_fcntl.h
@@ -22,7 +22,7 @@
 #ifndef OCS_FCNTL_H
 #define OCS_FCNTL_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 aba58fad0..db2e4d2b7 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_fenv.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_fenv.h
@@ -22,7 +22,7 @@
 #ifndef OCS_FENV_H
 #define OCS_FENV_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 97cab7bbc..42fe246c7 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_float.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_float.h
@@ -22,7 +22,7 @@
 #ifndef OCS_FLOAT_H
 #define OCS_FLOAT_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 ed9e020a3..91c6468c9 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_hostLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_hostLib.h
@@ -28,8 +28,8 @@
 #ifndef OCS_HOSTLIB_H
 #define OCS_HOSTLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 724f8396b..adf610020 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_intLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_intLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_INTLIB_H
 #define OCS_INTLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 0b326e904..f463e35bd 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_inttypes.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_inttypes.h
@@ -22,7 +22,7 @@
 #ifndef OCS_INTTYPES_H
 #define OCS_INTTYPES_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 6e8dd63d7..4b586b558 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ioLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ioLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_IOLIB_H
 #define OCS_IOLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 5ddb8182e..686331dc2 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_iv.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_iv.h
@@ -22,6 +22,6 @@
 #ifndef OCS_IV_H
 #define OCS_IV_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.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 b9eb5abc6..62ed85a88 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_loadLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_loadLib.h
@@ -22,9 +22,9 @@
 #ifndef OCS_LOADLIB_H
 #define OCS_LOADLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_moduleLib.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_moduleLib.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 40d070f8e..798113d67 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_locale.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_locale.h
@@ -22,7 +22,7 @@
 #ifndef OCS_LOCALE_H
 #define OCS_LOCALE_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 0eb53f915..192d96b9b 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_logLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_logLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_LOGLIB_H
 #define OCS_LOGLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 3b07bce2d..cf75ca7b3 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_math.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_math.h
@@ -22,7 +22,7 @@
 #ifndef OCS_MATH_H
 #define OCS_MATH_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 d1201761a..46c23f726 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_memPartLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_memPartLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_MEMPARTLIB_H
 #define OCS_MEMPARTLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 a7b3ca224..a2c634a6a 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_MODULELIB_H
 #define OCS_MODULELIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 da7ae4eb9..412384931 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_mqueue.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_mqueue.h
@@ -22,9 +22,9 @@
 #ifndef OCS_MQUEUE_H
 #define OCS_MQUEUE_H
 
-#include <OCS_basetypes.h>
-#include <OCS_sys_types.h>
-#include <OCS_time.h>
+#include "OCS_basetypes.h"
+#include "OCS_sys_types.h"
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 46e540cc7..e9c94ec7b 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_msgQLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_msgQLib.h
@@ -22,9 +22,9 @@
 #ifndef OCS_MSGQLIB_H
 #define OCS_MSGQLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
-#include <OCS_objLib.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
+#include "OCS_objLib.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 b04003749..ed4fca017 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
@@ -22,7 +22,7 @@
 #ifndef OCS_NET_IF_H
 #define OCS_NET_IF_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 69aedbfad..ffd623ec4 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_netdb.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_netdb.h
@@ -22,7 +22,7 @@
 #ifndef OCS_NETDB_H
 #define OCS_NETDB_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 db4194a17..efbc3333e 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
@@ -22,7 +22,7 @@
 #ifndef OCS_NETINET_IN_H
 #define OCS_NETINET_IN_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 e9a89fa26..7f4349b4e 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
@@ -22,7 +22,7 @@
 #ifndef OCS_NETINET_TCP_H
 #define OCS_NETINET_TCP_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 12716d859..8c9f45c30 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_objLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_objLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_OBJLIB_H
 #define OCS_OBJLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 471ebf757..1bff813f6 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_poll.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_poll.h
@@ -22,7 +22,7 @@
 #ifndef OCS_POLL_H
 #define OCS_POLL_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 975513806..359c60556 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_pthread.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_pthread.h
@@ -22,9 +22,9 @@
 #ifndef OCS_PTHREAD_H
 #define OCS_PTHREAD_H
 
-#include <OCS_basetypes.h>
-#include <OCS_sched.h>
-#include <OCS_time.h>
+#include "OCS_basetypes.h"
+#include "OCS_sched.h"
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 1eb14362d..d57f9c58c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ramDiskCbio.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ramDiskCbio.h
@@ -22,8 +22,8 @@
 #ifndef OCS_RAMDISKCBIO_H
 #define OCS_RAMDISKCBIO_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 6b6ce2e44..464114023 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ramDrv.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ramDrv.h
@@ -22,9 +22,9 @@
 #ifndef OCS_RAMDRV_H
 #define OCS_RAMDRV_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
-#include <OCS_blkIo.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
+#include "OCS_blkIo.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 ceae63638..3bdfadc54 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sched.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sched.h
@@ -22,7 +22,7 @@
 #ifndef OCS_SCHED_H
 #define OCS_SCHED_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 aedc0d2b2..d8979720b 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_semLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_semLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_SEMLIB_H
 #define OCS_SEMLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 b05c25df5..d09c76dd2 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_semaphore.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_semaphore.h
@@ -22,8 +22,8 @@
 #ifndef OCS_SEMAPHORE_H
 #define OCS_SEMAPHORE_H
 
-#include <OCS_basetypes.h>
-#include <OCS_time.h>
+#include "OCS_basetypes.h"
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 febc81156..516dff5ce 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_setjmp.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_setjmp.h
@@ -22,7 +22,7 @@
 #ifndef OCS_SETJMP_H
 #define OCS_SETJMP_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 4f316da0b..9a4ed1f0d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_shellLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_shellLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_SHELLLIB_H
 #define OCS_SHELLLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 13990a46f..0fde69fc3 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_signal.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_signal.h
@@ -22,8 +22,8 @@
 #ifndef OCS_SIGNAL_H
 #define OCS_SIGNAL_H
 
-#include <OCS_basetypes.h>
-#include <OCS_sys_types.h>
+#include "OCS_basetypes.h"
+#include "OCS_sys_types.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 bc2702ae5..92ec7b06c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stat.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stat.h
@@ -22,9 +22,9 @@
 #ifndef OCS_STAT_H
 #define OCS_STAT_H
 
-#include <OCS_basetypes.h>
-#include <OCS_sys_types.h>
-#include <OCS_time.h>
+#include "OCS_basetypes.h"
+#include "OCS_sys_types.h"
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in sys/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 b788b203f..253786b3d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stdarg.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stdarg.h
@@ -22,7 +22,7 @@
 #ifndef OCS_STDARG_H
 #define OCS_STDARG_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 31ce73425..9a7cb08fa 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stdio.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stdio.h
@@ -22,8 +22,8 @@
 #ifndef OCS_STDIO_H
 #define OCS_STDIO_H
 
-#include <OCS_basetypes.h>
-#include <OCS_stdarg.h>
+#include "OCS_basetypes.h"
+#include "OCS_stdarg.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 b0fe69988..9748fbda9 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_stdlib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_stdlib.h
@@ -22,7 +22,7 @@
 #ifndef OCS_STDLIB_H
 #define OCS_STDLIB_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 470ba2e82..c0efa0f96 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_string.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_string.h
@@ -22,7 +22,7 @@
 #ifndef OCS_STRING_H
 #define OCS_STRING_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 74e2c5cab..90cd12424 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_strings.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_strings.h
@@ -22,7 +22,7 @@
 #ifndef OCS_STRINGS_H
 #define OCS_STRINGS_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 16037a4f8..4d5b3ab40 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_symLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_symLib.h
@@ -29,8 +29,8 @@
 #ifndef OCS_SYMLIB_H
 #define OCS_SYMLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 0f6093256..4ab7399ee 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_sysLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_sysLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_SYSLIB_H
 #define OCS_SYSLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 60ef5e79e..3c28cfdd4 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
@@ -22,7 +22,7 @@
 #ifndef OCS_SYS_IOCTL_H
 #define OCS_SYS_IOCTL_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 f566826f2..cdc2ee19a 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
@@ -22,7 +22,7 @@
 #ifndef OCS_SYS_IPC_H
 #define OCS_SYS_IPC_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 7bdff049f..754dd358b 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
@@ -22,7 +22,7 @@
 #ifndef OCS_SYS_MMAN_H
 #define OCS_SYS_MMAN_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 531cad372..57098ca23 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
@@ -28,13 +28,15 @@
 #ifndef OCS_SYS_SELECT_H
 #define OCS_SYS_SELECT_H
 
-#include <OCS_basetypes.h>
-#include <OCS_time.h>
+#include "OCS_basetypes.h"
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in sys/select.h */
 /* ----------------------------------------- */
 
+#define OCS_FD_SETSIZE 10
+
 /* ----------------------------------------- */
 /* types normally defined in 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 098c1e16d..521903731 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
@@ -22,8 +22,8 @@
 #ifndef OCS_SYS_SOCKET_H
 #define OCS_SYS_SOCKET_H
 
-#include <OCS_basetypes.h>
-#include <OCS_sys_types.h>
+#include "OCS_basetypes.h"
+#include "OCS_sys_types.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 54b7044b3..b757f758f 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
@@ -22,8 +22,8 @@
 #ifndef OCS_SYS_TIME_H
 #define OCS_SYS_TIME_H
 
-#include <OCS_basetypes.h>
-#include <OCS_time.h>
+#include "OCS_basetypes.h"
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 3f92ec9ca..7ae0e2e86 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
@@ -22,8 +22,8 @@
 #ifndef OCS_SYS_TIMES_H
 #define OCS_SYS_TIMES_H
 
-#include <OCS_basetypes.h>
-#include <OCS_time.h>
+#include "OCS_basetypes.h"
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 e89672682..196f3ca83 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
@@ -22,7 +22,7 @@
 #ifndef OCS_SYS_TYPES_H
 #define OCS_SYS_TYPES_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 197ea1840..558e02dfb 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
@@ -22,7 +22,7 @@
 #ifndef OCS_SYS_UN_H
 #define OCS_SYS_UN_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 6ec53b345..10627de5d 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
@@ -22,7 +22,7 @@
 #ifndef OCS_SYS_WAIT_H
 #define OCS_SYS_WAIT_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 bc2bccc39..3e756dad6 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_taskLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_taskLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_TASKLIB_H
 #define OCS_TASKLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 9ac4f3937..814eaf4be 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_taskVarLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_taskVarLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_TASKVARLIB_H
 #define OCS_TASKVARLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 6420fa2d0..13960a7c5 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_termios.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_termios.h
@@ -22,7 +22,7 @@
 #ifndef OCS_TERMIOS_H
 #define OCS_TERMIOS_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 b547b841a..fcf5c453c 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_tgmath.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_tgmath.h
@@ -22,7 +22,7 @@
 #ifndef OCS_TGMATH_H
 #define OCS_TGMATH_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 20894c1b6..53ecd6317 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_time.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_time.h
@@ -22,8 +22,8 @@
 #ifndef OCS_TIME_H
 #define OCS_TIME_H
 
-#include <OCS_basetypes.h>
-#include <OCS_signal.h>
+#include "OCS_basetypes.h"
+#include "OCS_signal.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 be5085b59..c8c206fc9 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_timers.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_timers.h
@@ -22,7 +22,7 @@
 #ifndef OCS_TIMERS_H
 #define OCS_TIMERS_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 153150bec..5d4dbb487 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_ulimit.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_ulimit.h
@@ -22,7 +22,7 @@
 #ifndef OCS_ULIMIT_H
 #define OCS_ULIMIT_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 34a5d4c1c..cbcd050ea 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_unistd.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_unistd.h
@@ -22,8 +22,8 @@
 #ifndef OCS_UNISTD_H
 #define OCS_UNISTD_H
 
-#include <OCS_basetypes.h>
-#include <OCS_sys_types.h>
+#include "OCS_basetypes.h"
+#include "OCS_sys_types.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 c3de289e7..b5ada061f 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_unldLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_unldLib.h
@@ -22,9 +22,9 @@
 #ifndef OCS_UNLDLIB_H
 #define OCS_UNLDLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
-#include <OCS_moduleLib.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
+#include "OCS_moduleLib.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 bc8c9127a..d2bdf595d 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_usrLib.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_usrLib.h
@@ -22,8 +22,8 @@
 #ifndef OCS_USRLIB_H
 #define OCS_USRLIB_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 89766255f..c3ac91757 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_version.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_version.h
@@ -22,7 +22,7 @@
 #ifndef OCS_VERSION_H
 #define OCS_VERSION_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 6db9b9300..534e22204 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_vxWorks.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_vxWorks.h
@@ -28,7 +28,7 @@
 #ifndef OCS_VXWORKS_H
 #define OCS_VXWORKS_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 050413681..44c5c5674 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_wchar.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_wchar.h
@@ -22,7 +22,7 @@
 #ifndef OCS_WCHAR_H
 #define OCS_WCHAR_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 0aa046df6..10ea52963 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_wctype.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_wctype.h
@@ -22,7 +22,7 @@
 #ifndef OCS_WCTYPE_H
 #define OCS_WCTYPE_H
 
-#include <OCS_basetypes.h>
+#include "OCS_basetypes.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 346083205..99a013562 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_xbdBlkDev.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_xbdBlkDev.h
@@ -22,9 +22,9 @@
 #ifndef OCS_XBDBLKDEV_H
 #define OCS_XBDBLKDEV_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
-#include <OCS_blkIo.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
+#include "OCS_blkIo.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 ac2fec4df..1ddaf05e2 100644
--- a/src/unit-test-coverage/ut-stubs/inc/OCS_xbdRamDisk.h
+++ b/src/unit-test-coverage/ut-stubs/inc/OCS_xbdRamDisk.h
@@ -22,8 +22,8 @@
 #ifndef OCS_XBDRAMDISK_H
 #define OCS_XBDRAMDISK_H
 
-#include <OCS_basetypes.h>
-#include <OCS_vxWorks.h>
+#include "OCS_basetypes.h"
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in 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 b2a1af6b7..91b93545c 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_ARPA_INET_H
 #define OSAL_OVERRIDE_ARPA_INET_H
 
-#include <OCS_arpa_inet.h>
+#include "OCS_arpa_inet.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 7e606c698..083898254 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/assert.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/assert.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_ASSERT_H
 #define OSAL_OVERRIDE_ASSERT_H
 
-#include <OCS_assert.h>
+#include "OCS_assert.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 c367eb5e6..981a005b2 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/blkIo.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/blkIo.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_BLKIO_H
 #define OSAL_OVERRIDE_BLKIO_H
 
-#include <OCS_blkIo.h>
+#include "OCS_blkIo.h"
 #include <vxWorks.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 1d2456dd3..4b6a44c74 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/cbioLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/cbioLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_CBIOLIB_H
 #define OSAL_OVERRIDE_CBIOLIB_H
 
-#include <OCS_cbioLib.h>
+#include "OCS_cbioLib.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 18fe48ec8..fd7267ea4 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/complex.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/complex.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_COMPLEX_H
 #define OSAL_OVERRIDE_COMPLEX_H
 
-#include <OCS_complex.h>
+#include "OCS_complex.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 bc20c62fc..9842be2ed 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ctype.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ctype.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_CTYPE_H
 #define OSAL_OVERRIDE_CTYPE_H
 
-#include <OCS_ctype.h>
+#include "OCS_ctype.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 4b1de1b47..4b3e706b0 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/dirent.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/dirent.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_DIRENT_H
 #define OSAL_OVERRIDE_DIRENT_H
 
-#include <OCS_dirent.h>
+#include "OCS_dirent.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 20cccc404..ffa3ca272 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/dlfcn.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/dlfcn.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_DLFCN_H
 #define OSAL_OVERRIDE_DLFCN_H
 
-#include <OCS_dlfcn.h>
+#include "OCS_dlfcn.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 503da1d14..e43ab7127 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/dosFsLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_DOSFSLIB_H
 #define OSAL_OVERRIDE_DOSFSLIB_H
 
-#include <OCS_dosFsLib.h>
+#include "OCS_dosFsLib.h"
 #include <vxWorks.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 325551d07..9e7370008 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_DRV_HDISK_ATADRV_H
 #define OSAL_OVERRIDE_DRV_HDISK_ATADRV_H
 
-#include <OCS_drv_hdisk_ataDrv.h>
+#include "OCS_drv_hdisk_ataDrv.h"
 #include <vxWorks.h>
 #include <blkIo.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 80ccf685e..38735c41a 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/errno.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/errno.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_ERRNO_H
 #define OSAL_OVERRIDE_ERRNO_H
 
-#include <OCS_errno.h>
+#include "OCS_errno.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 a8589b83c..d1965b2b6 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/errnoLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_ERRNOLIB_H
 #define OSAL_OVERRIDE_ERRNOLIB_H
 
-#include <OCS_errnoLib.h>
+#include "OCS_errnoLib.h"
 #include <vxWorks.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 35cc45daa..dab3ef734 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/fcntl.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/fcntl.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_FCNTL_H
 #define OSAL_OVERRIDE_FCNTL_H
 
-#include <OCS_fcntl.h>
+#include "OCS_fcntl.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 8573a3de7..34a6e6531 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/fenv.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/fenv.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_FENV_H
 #define OSAL_OVERRIDE_FENV_H
 
-#include <OCS_fenv.h>
+#include "OCS_fenv.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 cc993a971..afdf0b572 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/float.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/float.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_FLOAT_H
 #define OSAL_OVERRIDE_FLOAT_H
 
-#include <OCS_float.h>
+#include "OCS_float.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 2719ea193..add8ec46f 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/hostLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/hostLib.h
@@ -29,7 +29,7 @@
 #ifndef HOSTLIB_H
 #define HOSTLIB_H
 
-#include <OCS_hostLib.h>
+#include "OCS_hostLib.h"
 #include <vxWorks.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 ed9669c40..736f08ad8 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/intLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/intLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_INTLIB_H
 #define OSAL_OVERRIDE_INTLIB_H
 
-#include <OCS_intLib.h>
+#include "OCS_intLib.h"
 #include <vxWorks.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 a973d6244..2b5633ee6 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/inttypes.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/inttypes.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_INTTYPES_H
 #define OSAL_OVERRIDE_INTTYPES_H
 
-#include <OCS_inttypes.h>
+#include "OCS_inttypes.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 f8006ed59..1ced55120 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ioLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ioLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_IOLIB_H
 #define OSAL_OVERRIDE_IOLIB_H
 
-#include <OCS_ioLib.h>
+#include "OCS_ioLib.h"
 #include <vxWorks.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 760755c9c..e0ec0fdab 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/iv.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/iv.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_IV_H
 #define OSAL_OVERRIDE_IV_H
 
-#include <OCS_iv.h>
+#include "OCS_iv.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 d45867fa5..00e6a9f1d 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/loadLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/loadLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_LOADLIB_H
 #define OSAL_OVERRIDE_LOADLIB_H
 
-#include <OCS_loadLib.h>
+#include "OCS_loadLib.h"
 #include <vxWorks.h>
 #include <moduleLib.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 07b96a1fc..da3c0920b 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/locale.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/locale.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_LOCALE_H
 #define OSAL_OVERRIDE_LOCALE_H
 
-#include <OCS_locale.h>
+#include "OCS_locale.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 a58c2b2a0..6be755fbb 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/logLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/logLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_LOGLIB_H
 #define OSAL_OVERRIDE_LOGLIB_H
 
-#include <OCS_logLib.h>
+#include "OCS_logLib.h"
 #include <vxWorks.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 ff67798ea..03a60c629 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/math.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/math.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_MATH_H
 #define OSAL_OVERRIDE_MATH_H
 
-#include <OCS_math.h>
+#include "OCS_math.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 d66695b40..5cde4f425 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/memPartLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/memPartLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_MEMPARTLIB_H
 #define OSAL_OVERRIDE_MEMPARTLIB_H
 
-#include <OCS_memPartLib.h>
+#include "OCS_memPartLib.h"
 #include <vxWorks.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 e15586153..5e8957d7e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/moduleLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_MODULELIB_H
 #define OSAL_OVERRIDE_MODULELIB_H
 
-#include <OCS_moduleLib.h>
+#include "OCS_moduleLib.h"
 #include <vxWorks.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 5bd35d613..95f791d65 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/mqueue.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/mqueue.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_MQUEUE_H
 #define OSAL_OVERRIDE_MQUEUE_H
 
-#include <OCS_mqueue.h>
+#include "OCS_mqueue.h"
 #include <time.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 8a5ba72d5..8bb978f79 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/msgQLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/msgQLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_MSGQLIB_H
 #define OSAL_OVERRIDE_MSGQLIB_H
 
-#include <OCS_msgQLib.h>
+#include "OCS_msgQLib.h"
 #include <vxWorks.h>
 #include <objLib.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 e3a1c48a2..b530ce1d4 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_NET_IF_H
 #define OSAL_OVERRIDE_NET_IF_H
 
-#include <OCS_net_if.h>
+#include "OCS_net_if.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 fe5425609..693b08916 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/netdb.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/netdb.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_NETDB_H
 #define OSAL_OVERRIDE_NETDB_H
 
-#include <OCS_netdb.h>
+#include "OCS_netdb.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 eb885172c..574d5a634 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_NETINET_IN_H
 #define OSAL_OVERRIDE_NETINET_IN_H
 
-#include <OCS_netinet_in.h>
+#include "OCS_netinet_in.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 a0269e6de..f2f3fd8f3 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_NETINET_TCP_H
 #define OSAL_OVERRIDE_NETINET_TCP_H
 
-#include <OCS_netinet_tcp.h>
+#include "OCS_netinet_tcp.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 54496069a..1dc632151 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/objLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/objLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_OBJLIB_H
 #define OSAL_OVERRIDE_OBJLIB_H
 
-#include <OCS_objLib.h>
+#include "OCS_objLib.h"
 #include <vxWorks.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 adaae476c..bd879b5e3 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/poll.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/poll.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_POLL_H
 #define OSAL_OVERRIDE_POLL_H
 
-#include <OCS_poll.h>
+#include "OCS_poll.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 3a061f2d4..a4b5251d0 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/pthread.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/pthread.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_PTHREAD_H
 #define OSAL_OVERRIDE_PTHREAD_H
 
-#include <OCS_pthread.h>
+#include "OCS_pthread.h"
 #include <sched.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 1c925fc43..723259488 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ramDiskCbio.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ramDiskCbio.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_RAMDISKCBIO_H
 #define OSAL_OVERRIDE_RAMDISKCBIO_H
 
-#include <OCS_ramDiskCbio.h>
+#include "OCS_ramDiskCbio.h"
 #include <vxWorks.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 97896710c..e0f68a4fe 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ramDrv.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_RAMDRV_H
 #define OSAL_OVERRIDE_RAMDRV_H
 
-#include <OCS_ramDrv.h>
+#include "OCS_ramDrv.h"
 #include <vxWorks.h>
 #include <blkIo.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 53f6484a3..18c0d153b 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sched.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sched.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SCHED_H
 #define OSAL_OVERRIDE_SCHED_H
 
-#include <OCS_sched.h>
+#include "OCS_sched.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in sched.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 d73febc05..d40ab228f 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/semLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/semLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SEMLIB_H
 #define OSAL_OVERRIDE_SEMLIB_H
 
-#include <OCS_semLib.h>
+#include "OCS_semLib.h"
 #include <vxWorks.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 845434983..6263e4943 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/semaphore.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/semaphore.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SEMAPHORE_H
 #define OSAL_OVERRIDE_SEMAPHORE_H
 
-#include <OCS_semaphore.h>
+#include "OCS_semaphore.h"
 #include <time.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 61d82bc1f..ebe9e27cd 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/setjmp.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/setjmp.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SETJMP_H
 #define OSAL_OVERRIDE_SETJMP_H
 
-#include <OCS_setjmp.h>
+#include "OCS_setjmp.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 ce6e4d61c..c175be692 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/shellLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/shellLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SHELLLIB_H
 #define OSAL_OVERRIDE_SHELLLIB_H
 
-#include <OCS_shellLib.h>
+#include "OCS_shellLib.h"
 #include <vxWorks.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 ec1b31caf..1e63a85de 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/signal.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/signal.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SIGNAL_H
 #define OSAL_OVERRIDE_SIGNAL_H
 
-#include <OCS_signal.h>
+#include "OCS_signal.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 e0cabeafd..e8760b467 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stat.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stat.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_STAT_H
 #define OSAL_OVERRIDE_STAT_H
 
-#include <OCS_stat.h>
+#include "OCS_stat.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in sys/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 187c73683..65e34c40e 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stdarg.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stdarg.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_STDARG_H
 #define OSAL_OVERRIDE_STDARG_H
 
-#include <OCS_stdarg.h>
+#include "OCS_stdarg.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 e09a93696..2ca37d9dd 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stdio.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stdio.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_STDIO_H
 #define OSAL_OVERRIDE_STDIO_H
 
-#include <OCS_stdio.h>
+#include "OCS_stdio.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 9ea6f219b..ca19025a4 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/stdlib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/stdlib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_STDLIB_H
 #define OSAL_OVERRIDE_STDLIB_H
 
-#include <OCS_stdlib.h>
+#include "OCS_stdlib.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 e4b83f152..82ef3a766 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/string.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/string.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_STRING_H
 #define OSAL_OVERRIDE_STRING_H
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 1d7142f31..ed473d569 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/strings.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/strings.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_STRINGS_H
 #define OSAL_OVERRIDE_STRINGS_H
 
-#include <OCS_strings.h>
+#include "OCS_strings.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 1adcd6adf..340f5f1a5 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/symLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/symLib.h
@@ -28,7 +28,7 @@
 #ifndef SYMLIB_H
 #define SYMLIB_H
 
-#include <OCS_symLib.h>
+#include "OCS_symLib.h"
 #include <vxWorks.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 8038d86b4..97daa628d 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_IOCTL_H
 #define OSAL_OVERRIDE_SYS_IOCTL_H
 
-#include <OCS_sys_ioctl.h>
+#include "OCS_sys_ioctl.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 7d99f3b4c..7729af5f8 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_IPC_H
 #define OSAL_OVERRIDE_SYS_IPC_H
 
-#include <OCS_sys_ipc.h>
+#include "OCS_sys_ipc.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 ef3c670f8..9a64e0fc2 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_MMAN_H
 #define OSAL_OVERRIDE_SYS_MMAN_H
 
-#include <OCS_sys_mman.h>
+#include "OCS_sys_mman.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 4a2ddb46f..8db827c2b 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
@@ -28,7 +28,7 @@
 #ifndef SELECT_H
 #define SELECT_H
 
-#include <OCS_sys_select.h>
+#include "OCS_sys_select.h"
 
 /* ----------------------------------------- */
 /* constants normally defined in sys/select.h */
@@ -50,4 +50,6 @@
 #define FD_CLR   OCS_FD_CLR
 #define FD_ZERO  OCS_FD_ZERO
 
+#define FD_SETSIZE OCS_FD_SETSIZE
+
 #endif /* SELECT_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 155f1e100..bec5af131 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_SOCKET_H
 #define OSAL_OVERRIDE_SYS_SOCKET_H
 
-#include <OCS_sys_socket.h>
+#include "OCS_sys_socket.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in sys/socket.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 111336de4..ced41f62b 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_TIME_H
 #define OSAL_OVERRIDE_SYS_TIME_H
 
-#include <OCS_sys_time.h>
+#include "OCS_sys_time.h"
 #include <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 052399273..810e64ce9 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_TIMES_H
 #define OSAL_OVERRIDE_SYS_TIMES_H
 
-#include <OCS_sys_times.h>
+#include "OCS_sys_times.h"
 #include <time.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 a08b204d5..57dc1b06a 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_TYPES_H
 #define OSAL_OVERRIDE_SYS_TYPES_H
 
-#include <OCS_sys_types.h>
+#include "OCS_sys_types.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 9addd5013..fa11207fc 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_UN_H
 #define OSAL_OVERRIDE_SYS_UN_H
 
-#include <OCS_sys_un.h>
+#include "OCS_sys_un.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 1d410f5e3..056695e1d 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
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYS_WAIT_H
 #define OSAL_OVERRIDE_SYS_WAIT_H
 
-#include <OCS_sys_wait.h>
+#include "OCS_sys_wait.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 145041eb7..a12d6f2aa 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/sysLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/sysLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_SYSLIB_H
 #define OSAL_OVERRIDE_SYSLIB_H
 
-#include <OCS_sysLib.h>
+#include "OCS_sysLib.h"
 #include <vxWorks.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 0b939ea80..8ad9d6a66 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/taskLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/taskLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_TASKLIB_H
 #define OSAL_OVERRIDE_TASKLIB_H
 
-#include <OCS_taskLib.h>
+#include "OCS_taskLib.h"
 #include <vxWorks.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 46f3f7a4a..c0b30e6b1 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/taskVarLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/taskVarLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_TASKVARLIB_H
 #define OSAL_OVERRIDE_TASKVARLIB_H
 
-#include <OCS_taskVarLib.h>
+#include "OCS_taskVarLib.h"
 #include <vxWorks.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 ab4887d2c..e0778df4c 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/termios.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/termios.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_TERMIOS_H
 #define OSAL_OVERRIDE_TERMIOS_H
 
-#include <OCS_termios.h>
+#include "OCS_termios.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 87bd41129..a30170916 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/tgmath.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/tgmath.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_TGMATH_H
 #define OSAL_OVERRIDE_TGMATH_H
 
-#include <OCS_tgmath.h>
+#include "OCS_tgmath.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 9cfcbe605..f0fdd91ba 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/time.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/time.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_TIME_H
 #define OSAL_OVERRIDE_TIME_H
 
-#include <OCS_time.h>
+#include "OCS_time.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 b6c6012ae..d52461e71 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/timers.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/timers.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_TIMERS_H
 #define OSAL_OVERRIDE_TIMERS_H
 
-#include <OCS_timers.h>
+#include "OCS_timers.h"
 #include <time.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 c1d9c6768..d9029e798 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/ulimit.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/ulimit.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_ULIMIT_H
 #define OSAL_OVERRIDE_ULIMIT_H
 
-#include <OCS_ulimit.h>
+#include "OCS_ulimit.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 31d3afeb6..becea6988 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/unistd.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/unistd.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_UNISTD_H
 #define OSAL_OVERRIDE_UNISTD_H
 
-#include <OCS_unistd.h>
+#include "OCS_unistd.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 5076192cf..b785a8784 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/unldLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/unldLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_UNLDLIB_H
 #define OSAL_OVERRIDE_UNLDLIB_H
 
-#include <OCS_unldLib.h>
+#include "OCS_unldLib.h"
 #include <vxWorks.h>
 #include <moduleLib.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 21f4b9104..8139f7488 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/usrLib.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/usrLib.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_USRLIB_H
 #define OSAL_OVERRIDE_USRLIB_H
 
-#include <OCS_usrLib.h>
+#include "OCS_usrLib.h"
 #include <vxWorks.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 4ccf55a6c..95980c7ab 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/version.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/version.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_VERSION_H
 #define OSAL_OVERRIDE_VERSION_H
 
-#include <OCS_version.h>
+#include "OCS_version.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 0f36e6510..93c28febd 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/vxWorks.h
@@ -28,7 +28,7 @@
 #ifndef VXWORKS_H
 #define VXWORKS_H
 
-#include <OCS_vxWorks.h>
+#include "OCS_vxWorks.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 9f0d251eb..6aaaaf783 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/wchar.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/wchar.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_WCHAR_H
 #define OSAL_OVERRIDE_WCHAR_H
 
-#include <OCS_wchar.h>
+#include "OCS_wchar.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 abcec3509..b0458a749 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/wctype.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/wctype.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_WCTYPE_H
 #define OSAL_OVERRIDE_WCTYPE_H
 
-#include <OCS_wctype.h>
+#include "OCS_wctype.h"
 
 /* ----------------------------------------- */
 /* mappings for declarations in 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 39bba2a37..20bc0dfcb 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/xbdBlkDev.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_XBDBLKDEV_H
 #define OSAL_OVERRIDE_XBDBLKDEV_H
 
-#include <OCS_xbdBlkDev.h>
+#include "OCS_xbdBlkDev.h"
 #include <vxWorks.h>
 #include <blkIo.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 9344b0294..57f9db894 100644
--- a/src/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
+++ b/src/unit-test-coverage/ut-stubs/override_inc/xbdRamDisk.h
@@ -22,7 +22,7 @@
 #ifndef OSAL_OVERRIDE_XBDRAMDISK_H
 #define OSAL_OVERRIDE_XBDRAMDISK_H
 
-#include <OCS_xbdRamDisk.h>
+#include "OCS_xbdRamDisk.h"
 #include <vxWorks.h>
 
 /* ----------------------------------------- */
diff --git a/src/unit-test-coverage/ut-stubs/src/arpa-inet-stubs.c b/src/unit-test-coverage/ut-stubs/src/arpa-inet-stubs.c
index d88be9ecb..27f89d3ad 100644
--- a/src/unit-test-coverage/ut-stubs/src/arpa-inet-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/arpa-inet-stubs.c
@@ -24,7 +24,7 @@
  */
 #include <arpa/inet.h>
 #include "utstubs.h"
-#include <OCS_arpa_inet.h>
+#include "OCS_arpa_inet.h"
 
 const char *OCS_inet_ntop(int af, const void *cp, char *buf, size_t len)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/libc-ctype-stubs.c b/src/unit-test-coverage/ut-stubs/src/libc-ctype-stubs.c
index 1ad576121..4606e4d71 100644
--- a/src/unit-test-coverage/ut-stubs/src/libc-ctype-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/libc-ctype-stubs.c
@@ -22,7 +22,7 @@
 #include <ctype.h>
 #include "utstubs.h"
 
-#include <OCS_ctype.h>
+#include "OCS_ctype.h"
 
 int OCS_isgraph(int c)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c b/src/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c
index c1bfd05ea..5f7adbc3c 100644
--- a/src/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/libc-stdio-stubs.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include "utstubs.h"
 
-#include <OCS_stdio.h>
+#include "OCS_stdio.h"
 
 struct OCS_FILE
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c b/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c
index 97a8e3492..c85761c2d 100644
--- a/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c
@@ -25,7 +25,7 @@
 #include "utstubs.h"
 #include "utassert.h"
 
-#include <OCS_stdlib.h>
+#include "OCS_stdlib.h"
 
 /*
  * The malloc emulator relies on two magic numbers;
diff --git a/src/unit-test-coverage/ut-stubs/src/libc-string-stubs.c b/src/unit-test-coverage/ut-stubs/src/libc-string-stubs.c
index 3cc275c2d..d9cb89a47 100644
--- a/src/unit-test-coverage/ut-stubs/src/libc-string-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/libc-string-stubs.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include "utstubs.h"
 
-#include <OCS_string.h>
+#include "OCS_string.h"
 
 void *OCS_memset(void *s, int c, size_t n)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/netinet-in-stubs.c b/src/unit-test-coverage/ut-stubs/src/netinet-in-stubs.c
index 18d0351b0..74fdf1451 100644
--- a/src/unit-test-coverage/ut-stubs/src/netinet-in-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/netinet-in-stubs.c
@@ -23,7 +23,7 @@
  * \ingroup  ut-stubs
  */
 #include "utstubs.h"
-#include <OCS_arpa_inet.h>
+#include "OCS_arpa_inet.h"
 
 uint16_t OCS_htons(uint16_t hostshort)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-dirent-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-dirent-stubs.c
index 98b96b4d8..190d50d65 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-dirent-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-dirent-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_dirent.h>
+#include "OCS_dirent.h"
 
 struct OCS_DIR
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-errno-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-errno-stubs.c
index 7d4bc494c..da2bbc241 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-errno-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-errno-stubs.c
@@ -23,6 +23,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_errno.h>
+#include "OCS_errno.h"
 
 int OCS_errno = 0;
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-fcntl-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-fcntl-stubs.c
index 52bfa82c6..a8d8dc308 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-fcntl-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-fcntl-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_fcntl.h>
+#include "OCS_fcntl.h"
 
 int OCS_fcntl(int fd, int cmd, ...)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-ioctl-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-ioctl-stubs.c
index dc4b4d299..45338ae66 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-ioctl-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-ioctl-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_sys_ioctl.h>
+#include "OCS_sys_ioctl.h"
 
 int OCS_ioctl(int fd, unsigned long req, ...)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-mqueue-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-mqueue-stubs.c
index 63695333c..cf85daa40 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-mqueue-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-mqueue-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_mqueue.h>
+#include "OCS_mqueue.h"
 
 int OCS_mq_close(OCS_mqd_t mqdes)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c
index f27231b82..17bcb2d46 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_pthread.h>
+#include "OCS_pthread.h"
 
 int OCS_pthread_attr_destroy(OCS_pthread_attr_t *attr)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-sched-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-sched-stubs.c
index c73fd4f36..f38c9ef8b 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-sched-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-sched-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_sched.h>
+#include "OCS_sched.h"
 
 int OCS_sched_get_priority_max(int policy)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-semaphore-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-semaphore-stubs.c
index 050664b58..59d91b8b6 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-semaphore-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-semaphore-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_semaphore.h>
+#include "OCS_semaphore.h"
 
 int OCS_sem_destroy(OCS_sem_t *sem)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-signal-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-signal-stubs.c
index 3ab5f74c3..c1ace4459 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-signal-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-signal-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_signal.h>
+#include "OCS_signal.h"
 
 int OCS_kill(OCS_pid_t pid, int sig)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-stat-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-stat-stubs.c
index 397b7446b..e9df6d9cb 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-stat-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-stat-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_stat.h>
+#include "OCS_stat.h"
 
 int OCS_fchmod(int fd, OCS_mode_t mode)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-time-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-time-stubs.c
index 7b447ca72..d92b5edd0 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-time-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-time-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_time.h>
+#include "OCS_time.h"
 
 int OCS_clock_getres(OCS_clockid_t clock_id, struct OCS_timespec *res)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/posix-unistd-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-unistd-stubs.c
index b23a44845..834c5e30b 100644
--- a/src/unit-test-coverage/ut-stubs/src/posix-unistd-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/posix-unistd-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_unistd.h>
+#include "OCS_unistd.h"
 
 #define OCS_MAX_RDWR_SIZE 0x01000000 /* 16MB */
 
diff --git a/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c b/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c
index 1495272ab..d726576e5 100644
--- a/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_sys_select.h>
+#include "OCS_sys_select.h"
 
 int OCS_select(int nfds, OCS_fd_set *readfds, OCS_fd_set *writefds, OCS_fd_set *exceptfds, struct OCS_timeval *timeout)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/sys-socket-stubs.c b/src/unit-test-coverage/ut-stubs/src/sys-socket-stubs.c
index 88448c9c0..6a7e0d9d2 100644
--- a/src/unit-test-coverage/ut-stubs/src/sys-socket-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/sys-socket-stubs.c
@@ -23,7 +23,7 @@
  * \ingroup  ut-stubs
  */
 #include "utstubs.h"
-#include <OCS_sys_socket.h>
+#include "OCS_sys_socket.h"
 
 int OCS_accept(int fd, struct OCS_sockaddr *addr, OCS_socklen_t *addr_len)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c
index 53a59e670..8c3785dff 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-ataDrv-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_drv_hdisk_ataDrv.h>
+#include "OCS_drv_hdisk_ataDrv.h"
 
 static OCS_BLK_DEV LOCAL_ATADEV = {0};
 
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c
index 902d0071f..0147c57bb 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_dosFsLib.h>
+#include "OCS_dosFsLib.h"
 
 /* ----------------------------------------- */
 /* prototypes normally declared in dosFsLib.h */
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-errnoLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-errnoLib-stubs.c
index c9671ae7f..feaaa87a9 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-errnoLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-errnoLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_errnoLib.h>
+#include "OCS_errnoLib.h"
 
 int OCS_errnoGet(void)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c
index 2c803e214..f1448981c 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_hostLib.h>
+#include "OCS_hostLib.h"
 
 int OCS_hostGetByName(char *name)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c
index ff3d15fde..2b22aba0b 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_intLib.h>
+#include "OCS_intLib.h"
 
 OCS_STATUS OCS_intConnect(OCS_VOIDFUNCPTR *vector, OCS_VOIDFUNCPTR routine, int parameter)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c
index ed2a56f08..984d37365 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_loadLib.h>
-#include <OCS_unldLib.h>
+#include "OCS_loadLib.h"
+#include "OCS_unldLib.h"
 
 static OCS_MODULE LOCAL_MODULE = {0};
 
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c
index 555385522..e105bd41a 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_memPartLib.h>
+#include "OCS_memPartLib.h"
 
 OCS_STATUS OCS_memPartShow(OCS_PART_ID partId, int type)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c
index 06a42946d..c0b6faccd 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-moduleLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_moduleLib.h>
+#include "OCS_moduleLib.h"
 
 OCS_STATUS OCS_moduleInfoGet(OCS_MODULE_ID moduleId, OCS_MODULE_INFO *pModuleInfo)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c
index e240d90f1..3b5ea7aaa 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_msgQLib.h>
+#include "OCS_msgQLib.h"
 
 static OCS_MSG_Q LOCAL_UT_MSGQ = {0};
 
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-ramDrv-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-ramDrv-stubs.c
index 85fc78bfb..bf13f5282 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-ramDrv-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-ramDrv-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_ramDrv.h>
+#include "OCS_ramDrv.h"
 
 static OCS_BLK_DEV LOCAL_RAMDEV = {0};
 
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c
index 16735ddde..ccad2f262 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_semLib.h>
+#include "OCS_semLib.h"
 
 static OCS_SEM LOCAL_UT_SEM = {0};
 
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c
index 1c40db0fe..aef202f76 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_shellLib.h>
+#include "OCS_shellLib.h"
 
 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)
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c
index e7383bc43..765168ac8 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_symLib.h>
+#include "OCS_symLib.h"
 
 struct OCS_SYMBOL
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c
index f822ac79d..f9259487c 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_sysLib.h>
+#include "OCS_sysLib.h"
 
 int OCS_sysClkRateGet(void)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c
index 8c3886614..a1413db3f 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_taskLib.h>
-#include <OCS_errnoLib.h>
+#include "OCS_taskLib.h"
+#include "OCS_errnoLib.h"
 
 static OCS_WIND_TCB OCS_LOCAL_TASK = {0};
 
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c
index b704b7ec5..966069038 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_taskVarLib.h>
+#include "OCS_taskVarLib.h"
 
 OCS_STATUS OCS_taskVarAdd(int tid, int *pVar)
 {
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c
index 72766b02d..6c8081c44 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <OCS_xbdBlkDev.h>
+#include "OCS_xbdBlkDev.h"
 
 OCS_device_t OCS_xbdBlkDevCreateSync(OCS_BLK_DEV *bd, const char *name)
 {
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 3e33db446..e3ced2751 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
@@ -29,9 +29,9 @@
 #define UT_ADAPTOR_BINSEM_H
 
 #include "common_types.h"
-#include <utstubs.h>
-#include <OCS_taskLib.h>
-#include <OCS_semLib.h>
+#include "utstubs.h"
+#include "OCS_taskLib.h"
+#include "OCS_semLib.h"
 
 extern void *const  UT_Ref_OS_impl_bin_sem_table;
 extern size_t const UT_Ref_OS_impl_bin_sem_table_SIZE;
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 75dd24a0a..ece0fa66c 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
@@ -29,8 +29,8 @@
 #define UT_ADAPTOR_COMMON_H
 
 #include "common_types.h"
-#include <utstubs.h>
-#include <OCS_semLib.h>
+#include "utstubs.h"
+#include "OCS_semLib.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 9e628a9ec..57eb05ac5 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
@@ -29,8 +29,8 @@
 #define UT_ADAPTOR_COUNTSEM_H
 
 #include "common_types.h"
-#include <OCS_taskLib.h>
-#include <OCS_semLib.h>
+#include "OCS_taskLib.h"
+#include "OCS_semLib.h"
 
 extern void *const  UT_Ref_OS_impl_count_sem_table;
 extern size_t const UT_Ref_OS_impl_count_sem_table_SIZE;
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 b82f90ca0..88242f384 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
@@ -29,7 +29,7 @@
 #define UT_ADAPTOR_FILESYS_H
 
 #include "common_types.h"
-#include <OCS_xbdBlkDev.h>
+#include "OCS_xbdBlkDev.h"
 
 extern void *const  UT_Ref_OS_impl_filesys_table;
 extern size_t const UT_Ref_OS_impl_filesys_table_SIZE;
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 3881fde0e..06c1226ca 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
@@ -29,7 +29,7 @@
 #define UT_ADAPTOR_FILETABLE_STUB_H
 
 #include "common_types.h"
-#include <utstubs.h>
+#include "utstubs.h"
 
 extern void *const  UT_FileTableTest_OS_impl_filehandle_table;
 extern size_t const UT_FileTableTest_OS_impl_filehandle_table_SIZE;
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 69117f85e..b3483c92d 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
@@ -29,7 +29,7 @@
 #define UT_ADAPTOR_IDMAP_H
 
 #include "common_types.h"
-#include <OCS_semLib.h>
+#include "OCS_semLib.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 2d5a11827..71dbe1c1f 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
@@ -29,9 +29,9 @@
 #define UT_ADAPTOR_LOADER_H
 
 #include "common_types.h"
-#include <utstubs.h>
-#include <OCS_taskLib.h>
-#include <OCS_semLib.h>
+#include "utstubs.h"
+#include "OCS_taskLib.h"
+#include "OCS_semLib.h"
 
 extern void *const  UT_Ref_OS_impl_module_table;
 extern size_t const UT_Ref_OS_impl_module_table_SIZE;
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 a4ed0f0ac..d92366e3c 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
@@ -29,8 +29,8 @@
 #define UT_ADAPTOR_MUTEX_H
 
 #include "common_types.h"
-#include <OCS_taskLib.h>
-#include <OCS_semLib.h>
+#include "OCS_taskLib.h"
+#include "OCS_semLib.h"
 
 extern void *const  UT_Ref_OS_impl_mutex_table;
 extern size_t const UT_Ref_OS_impl_mutex_table_SIZE;
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 e29935dc5..6ea819a9b 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
@@ -29,7 +29,7 @@
 #define UT_ADAPTOR_QUEUES_H
 
 #include "common_types.h"
-#include <OCS_msgQLib.h>
+#include "OCS_msgQLib.h"
 
 extern void *const  UT_Ref_OS_impl_queue_table;
 extern size_t const UT_Ref_OS_impl_queue_table_SIZE;
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 68a4894f5..6a147f521 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
@@ -29,7 +29,7 @@
 #define UT_ADAPTOR_TASKS_H
 
 #include "common_types.h"
-#include <OCS_taskLib.h>
+#include "OCS_taskLib.h"
 
 extern void *const  UT_Ref_OS_impl_task_table;
 extern size_t const UT_Ref_OS_impl_task_table_SIZE;
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 a377dd541..6317489c5 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
@@ -29,8 +29,8 @@
 #define UT_ADAPTOR_TIMEBASE_H
 
 #include "common_types.h"
-#include <OCS_symLib.h>
-#include <OCS_time.h>
+#include "OCS_symLib.h"
+#include "OCS_time.h"
 
 extern void *const  UT_Ref_OS_impl_timebase_table;
 extern size_t const UT_Ref_OS_impl_timebase_table_SIZE;
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c
index 1511fcd91..10988edc4 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-binsem.h"
 
-#include <os-vxworks.h>
-#include <os-impl-binsem.h>
+#include "os-vxworks.h"
+#include "os-impl-binsem.h"
 
 void *const  UT_Ref_OS_impl_bin_sem_table      = OS_impl_bin_sem_table;
 size_t const UT_Ref_OS_impl_bin_sem_table_SIZE = sizeof(OS_impl_bin_sem_table);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c
index 065795735..ede317707 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <os-vxworks.h>
+#include "os-vxworks.h"
 #include "ut-adaptor-common.h"
 
 const UT_EntryKey_t UT_StubKey_OS_VxWorks_TableMutex_Init = UT_KEY(OS_VxWorks_TableMutex_Init);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c
index 8d474d81c..c69adb7ee 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-console.h"
 
-#include <os-vxworks.h>
-#include <os-impl-console.h>
+#include "os-vxworks.h"
+#include "os-impl-console.h"
 
 void *const  UT_Ref_OS_impl_console_table      = OS_impl_console_table;
 size_t const UT_Ref_OS_impl_console_table_SIZE = sizeof(OS_impl_console_table);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c
index 6f33930fd..0997c7a11 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c
@@ -28,8 +28,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-countsem.h"
 
-#include <os-vxworks.h>
-#include <os-impl-countsem.h>
+#include "os-vxworks.h"
+#include "os-impl-countsem.h"
 
 void *const  UT_Ref_OS_impl_count_sem_table      = OS_impl_count_sem_table;
 size_t const UT_Ref_OS_impl_count_sem_table_SIZE = sizeof(OS_impl_count_sem_table);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c
index 0422e6270..9df04dd8b 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-dirs.h"
 
-#include <os-vxworks.h>
-#include <os-impl-dirs.h>
+#include "os-vxworks.h"
+#include "os-impl-dirs.h"
 
 int32 UT_Call_OS_VxWorks_DirAPI_Impl_Init(void)
 {
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c
index 392b5cee0..406b4c5e8 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c
@@ -28,8 +28,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-filetable-stub.h"
 
-#include <os-vxworks.h>
-#include <os-impl-dirs.h>
-#include <os-shared-dir.h>
+#include "os-vxworks.h"
+#include "os-impl-dirs.h"
+#include "os-shared-dir.h"
 
 OS_impl_dir_internal_record_t OS_impl_dir_table[OS_MAX_NUM_OPEN_DIRS];
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c
index 017750b9e..be3e13f93 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-files.h"
 
-#include <os-vxworks.h>
-#include <os-impl-files.h>
+#include "os-vxworks.h"
+#include "os-impl-files.h"
 
 int32 UT_Call_OS_VxWorks_StreamAPI_Impl_Init(void)
 {
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c
index 0e5331f22..45ffc5720 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c
@@ -28,8 +28,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-filesys.h"
 
-#include <os-vxworks.h>
-#include <os-impl-filesys.h>
+#include "os-vxworks.h"
+#include "os-impl-filesys.h"
 
 void *const  UT_Ref_OS_impl_filesys_table      = OS_impl_filesys_table;
 size_t const UT_Ref_OS_impl_filesys_table_SIZE = sizeof(OS_impl_filesys_table);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c
index 20af8c951..cf867d685 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c
@@ -28,8 +28,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-filetable-stub.h"
 
-#include <os-vxworks.h>
-#include <os-impl-files.h>
+#include "os-vxworks.h"
+#include "os-impl-files.h"
 
 OS_impl_file_internal_record_t OS_impl_filehandle_table[OS_MAX_NUM_OPEN_FILES];
 
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c
index f436f8146..a80cc6d41 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <os-vxworks.h>
+#include "os-vxworks.h"
 #include "os-impl-idmap.h"
 #include "ut-adaptor-idmap.h"
 
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c
index 753563507..6e35f7e9a 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-loader.h"
 
-#include <os-vxworks.h>
-#include <os-impl-loader.h>
+#include "os-vxworks.h"
+#include "os-impl-loader.h"
 
 void *const  UT_Ref_OS_impl_module_table      = OS_impl_module_table;
 size_t const UT_Ref_OS_impl_module_table_SIZE = sizeof(OS_impl_module_table);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c
index 9c7b0c3af..8a8fd08b2 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-mutex.h"
 
-#include <os-vxworks.h>
-#include <os-impl-mutex.h>
+#include "os-vxworks.h"
+#include "os-impl-mutex.h"
 
 void *const  UT_Ref_OS_impl_mutex_table      = OS_impl_mutex_table;
 size_t const UT_Ref_OS_impl_mutex_table_SIZE = sizeof(OS_impl_mutex_table);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c
index c7cca7e2d..60aa8ea45 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-queues.h"
 
-#include <os-vxworks.h>
-#include <os-impl-queues.h>
+#include "os-vxworks.h"
+#include "os-impl-queues.h"
 
 void *const  UT_Ref_OS_impl_queue_table      = OS_impl_queue_table;
 size_t const UT_Ref_OS_impl_queue_table_SIZE = sizeof(OS_impl_queue_table);
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c
index 5cdbb8d10..6702e8c0e 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-loader.h"
 
-#include <os-vxworks.h>
-#include <os-impl-symtab.h>
+#include "os-vxworks.h"
+#include "os-impl-symtab.h"
 
 /*
  * A UT-specific wrapper function to invoke the Symbol Table Iterator.
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c
index 4fdeabb57..e448ebe44 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-tasks.h"
 
-#include <os-vxworks.h>
-#include <os-impl-tasks.h>
+#include "os-vxworks.h"
+#include "os-impl-tasks.h"
 #include "osapi-idmap.h"
 
 void *const  UT_Ref_OS_impl_task_table      = OS_impl_task_table;
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c
index e1eb97c8f..943592520 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c
@@ -29,8 +29,8 @@
 #include "osconfig.h"
 #include "ut-adaptor-timebase.h"
 
-#include <os-vxworks.h>
-#include <os-impl-timebase.h>
+#include "os-vxworks.h"
+#include "os-impl-timebase.h"
 
 void *const  UT_Ref_OS_impl_timebase_table      = OS_impl_timebase_table;
 size_t const UT_Ref_OS_impl_timebase_table_SIZE = sizeof(OS_impl_timebase_table);
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c b/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c
index 41e19cf25..ed49bb969 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c
@@ -32,8 +32,8 @@
 #include "os-shared-idmap.h"
 #include "os-shared-timebase.h"
 
-#include <OCS_errno.h>
-#include <OCS_objLib.h>
+#include "OCS_errno.h"
+#include "OCS_objLib.h"
 
 void Test_OS_VxWorks_BinSemAPI_Impl_Init(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-common.c b/src/unit-test-coverage/vxworks/src/coveragetest-common.c
index 85ce295c1..41b4eda18 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-common.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-common.c
@@ -30,8 +30,8 @@
 
 #include "os-shared-common.h"
 
-#include <OCS_errno.h>
-#include <OCS_objLib.h>
+#include "OCS_errno.h"
+#include "OCS_objLib.h"
 
 OCS_SEM TestGlobalSem;
 
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-console.c b/src/unit-test-coverage/vxworks/src/coveragetest-console.c
index 39dc83670..1865b4afa 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-console.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-console.c
@@ -29,11 +29,11 @@
 #include "ut-adaptor-console.h"
 #include "os-shared-printf.h"
 
-#include <OCS_unistd.h>
-#include <OCS_semLib.h>
-#include <OCS_taskLib.h>
-#include <OCS_errnoLib.h>
-#include <OCS_stdio.h>
+#include "OCS_unistd.h"
+#include "OCS_semLib.h"
+#include "OCS_taskLib.h"
+#include "OCS_errnoLib.h"
+#include "OCS_stdio.h"
 
 void Test_OS_ConsoleWakeup_Impl(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c b/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c
index c7c402383..7bc42b3ab 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c
@@ -30,11 +30,11 @@
 
 #include "os-shared-dir.h"
 
-#include <OCS_stdlib.h>
-#include <OCS_taskLib.h>
-#include <OCS_dirent.h>
-#include <OCS_unistd.h>
-#include <OCS_stat.h>
+#include "OCS_stdlib.h"
+#include "OCS_taskLib.h"
+#include "OCS_dirent.h"
+#include "OCS_unistd.h"
+#include "OCS_stat.h"
 
 void Test_OS_VxWorks_DirAPI_Impl_Init(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-files.c b/src/unit-test-coverage/vxworks/src/coveragetest-files.c
index fafb9cd0f..18a3a82d7 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-files.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-files.c
@@ -29,11 +29,11 @@
 
 #include "os-shared-file.h"
 
-#include <OCS_stdlib.h>
-#include <OCS_taskLib.h>
-#include <OCS_shellLib.h>
-#include <OCS_unistd.h>
-#include <OCS_stat.h>
+#include "OCS_stdlib.h"
+#include "OCS_taskLib.h"
+#include "OCS_shellLib.h"
+#include "OCS_unistd.h"
+#include "OCS_stat.h"
 
 void Test_OS_VxWorks_StreamAPI_Impl_Init(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c b/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
index 8e08eae57..4e852f2a2 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
@@ -30,14 +30,14 @@
 
 #include "os-shared-filesys.h"
 
-#include <OCS_stdlib.h>
-#include <OCS_sys_ioctl.h>
-#include <OCS_stat.h>
-#include <OCS_fcntl.h>
-#include <OCS_unistd.h>
-#include <OCS_ramDrv.h>
-#include <OCS_dosFsLib.h>
-#include <OCS_xbdBlkDev.h>
+#include "OCS_stdlib.h"
+#include "OCS_sys_ioctl.h"
+#include "OCS_stat.h"
+#include "OCS_fcntl.h"
+#include "OCS_unistd.h"
+#include "OCS_ramDrv.h"
+#include "OCS_dosFsLib.h"
+#include "OCS_xbdBlkDev.h"
 
 void Test_OS_FileSysStartVolume_Impl(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-heap.c b/src/unit-test-coverage/vxworks/src/coveragetest-heap.c
index 06b04b7a5..b701cea70 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-heap.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-heap.c
@@ -27,7 +27,7 @@
 #include "os-vxworks-coveragetest.h"
 #include "os-shared-heap.h"
 
-#include <OCS_memPartLib.h>
+#include "OCS_memPartLib.h"
 
 void Test_OS_HeapGetInfo_Impl(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c b/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
index f593d6148..a5da6f09f 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
@@ -30,8 +30,8 @@
 
 #include "os-shared-idmap.h"
 
-#include <OCS_errno.h>
-#include <OCS_objLib.h>
+#include "OCS_errno.h"
+#include "OCS_objLib.h"
 
 OCS_SEM TestGlobalSem;
 
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-loader.c b/src/unit-test-coverage/vxworks/src/coveragetest-loader.c
index 505f69892..bb3e14f8f 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-loader.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-loader.c
@@ -29,13 +29,13 @@
 
 #include "os-shared-module.h"
 
-#include <OCS_string.h>
-#include <OCS_fcntl.h>
-#include <OCS_unistd.h>
-#include <OCS_errnoLib.h>
-#include <OCS_moduleLib.h>
-#include <OCS_loadLib.h>
-#include <OCS_unldLib.h>
+#include "OCS_string.h"
+#include "OCS_fcntl.h"
+#include "OCS_unistd.h"
+#include "OCS_errnoLib.h"
+#include "OCS_moduleLib.h"
+#include "OCS_loadLib.h"
+#include "OCS_unldLib.h"
 
 void Test_OS_VxWorks_ModuleAPI_Impl_Init(void)
 {
@@ -87,12 +87,12 @@ void Test_OS_ModuleGetInfo_Impl(void)
     UtAssert_True(module_prop.addr.valid, "addresses in output valid");
 
     /*
-     * Note this still returns SUCCESS if the underlying call fails,
-     * but the boolean in the output struct should be false.
+     * This returns OS_ERROR if the underlying call fails,
+     * and the boolean in the output struct should be false.
      */
     memset(&module_prop, 0, sizeof(module_prop));
     UT_SetDefaultReturnValue(UT_KEY(OCS_moduleInfoGet), OCS_ERROR);
-    OSAPI_TEST_FUNCTION_RC(OS_ModuleGetInfo_Impl(&token, &module_prop), OS_SUCCESS);
+    OSAPI_TEST_FUNCTION_RC(OS_ModuleGetInfo_Impl(&token, &module_prop), OS_ERROR);
     UT_ClearDefaultReturnValue(UT_KEY(OCS_moduleInfoGet));
     UtAssert_True(!module_prop.addr.valid, "addresses in output not valid");
 }
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-network.c b/src/unit-test-coverage/vxworks/src/coveragetest-network.c
index e241c74f2..908ca50db 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-network.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-network.c
@@ -28,8 +28,8 @@
 
 #include "os-shared-network.h"
 
-#include <OCS_unistd.h>
-#include <OCS_hostLib.h>
+#include "OCS_unistd.h"
+#include "OCS_hostLib.h"
 
 /*----------------------------------------------------------------
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c b/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
index e736cbecf..4c6925d5b 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
@@ -27,13 +27,13 @@
 #include "os-vxworks-coveragetest.h"
 #include "ut-adaptor-no-module.h"
 
-#include <OCS_string.h>
-#include <OCS_fcntl.h>
-#include <OCS_unistd.h>
-#include <OCS_errnoLib.h>
-#include <OCS_moduleLib.h>
-#include <OCS_loadLib.h>
-#include <OCS_unldLib.h>
+#include "OCS_string.h"
+#include "OCS_fcntl.h"
+#include "OCS_unistd.h"
+#include "OCS_errnoLib.h"
+#include "OCS_moduleLib.h"
+#include "OCS_loadLib.h"
+#include "OCS_unldLib.h"
 
 void Test_OS_VxWorks_ModuleAPI_Impl_Init(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-queues.c b/src/unit-test-coverage/vxworks/src/coveragetest-queues.c
index f8f67afd4..8a3b6241a 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-queues.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-queues.c
@@ -29,8 +29,8 @@
 #include "os-shared-queue.h"
 #include "os-shared-timebase.h"
 
-#include <OCS_msgQLib.h>
-#include <OCS_errno.h>
+#include "OCS_msgQLib.h"
+#include "OCS_errno.h"
 
 void Test_OS_VxWorks_QueueAPI_Impl_Init(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-shell.c b/src/unit-test-coverage/vxworks/src/coveragetest-shell.c
index 2195ff349..29f2bcb4b 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-shell.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-shell.c
@@ -28,8 +28,8 @@
 #include "ut-adaptor-filetable-stub.h"
 #include "os-shared-file.h"
 
-#include <OCS_shellLib.h>
-#include <OCS_taskLib.h>
+#include "OCS_shellLib.h"
+#include "OCS_taskLib.h"
 
 void Test_OS_ShellOutputToFile_Impl(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c b/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
index 6bca6074b..147556b3d 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
@@ -28,10 +28,10 @@
 #include "ut-adaptor-symtab.h"
 #include "os-shared-module.h"
 
-#include <OCS_string.h>
-#include <OCS_unistd.h>
-#include <OCS_fcntl.h>
-#include <OCS_symLib.h>
+#include "OCS_string.h"
+#include "OCS_unistd.h"
+#include "OCS_fcntl.h"
+#include "OCS_symLib.h"
 
 void Test_OS_GlobalSymbolLookup_Impl(void)
 {
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c b/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
index 8af36a00d..8f7604dbf 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
@@ -31,7 +31,7 @@
 #include "os-shared-idmap.h"
 #include "os-shared-timebase.h"
 
-#include <OCS_stdlib.h>
+#include "OCS_stdlib.h"
 
 /*
  * A chunk of memory usable as a heap for malloc() emulation
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c b/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
index 5455ecce4..13d98c126 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
@@ -29,11 +29,11 @@
 #include "ut-adaptor-timebase.h"
 #include "os-shared-timebase.h"
 
-#include <OCS_taskLib.h>
-#include <OCS_signal.h>
-#include <OCS_time.h>
-#include <OCS_sysLib.h>
-#include <OCS_semLib.h>
+#include "OCS_taskLib.h"
+#include "OCS_signal.h"
+#include "OCS_time.h"
+#include "OCS_sysLib.h"
+#include "OCS_semLib.h"
 
 void Test_OS_VxWorks_TimeBaseAPI_Impl_Init(void)
 {
@@ -191,7 +191,12 @@ void Test_OS_VxWorks_SigWait(void)
     UT_SetDataBuffer(UT_KEY(OCS_timer_settime), &config_value, sizeof(config_value), false);
     UT_SetDataBuffer(UT_KEY(OCS_timer_gettime), &config_value, sizeof(config_value), false);
     UT_TimeBaseTest_Setup(UT_INDEX_0, signo, true);
-    OS_TimeBaseSet_Impl(&token, 1111111, 2222222);
+    OSAPI_TEST_FUNCTION_RC(OS_TimeBaseSet_Impl(&token, 1111111, 2222222), OS_SUCCESS);
+
+    UT_SetDataBuffer(UT_KEY(OCS_timer_settime), &config_value, sizeof(config_value), false);
+    UT_SetDeferredRetcode(UT_KEY(OCS_timer_gettime), 1, OCS_ERROR);
+    UT_TimeBaseTest_Setup(UT_INDEX_0, signo, true);
+    OSAPI_TEST_FUNCTION_RC(OS_TimeBaseSet_Impl(&token, 1111111, 2222222), OS_ERROR);
 
     UT_SetDataBuffer(UT_KEY(OCS_sigwait), &signo, sizeof(signo), false);
     OSAPI_TEST_FUNCTION_RC(UT_TimeBaseTest_CallSigWaitFunc(OS_OBJECT_ID_UNDEFINED), 1111111);
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 ac41fa602..aeada46d6 100644
--- a/src/unit-test-coverage/vxworks/src/os-vxworks-coveragetest.h
+++ b/src/unit-test-coverage/vxworks/src/os-vxworks-coveragetest.h
@@ -28,9 +28,9 @@
 #ifndef OS_VXWORKS_COVERAGETEST_H
 #define OS_VXWORKS_COVERAGETEST_H
 
-#include <utassert.h>
-#include <uttest.h>
-#include <utstubs.h>
+#include "utassert.h"
+#include "uttest.h"
+#include "utstubs.h"
 
 #include "os-shared-idmap.h"
 
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c
index cd578f480..ab1704489 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-binsem.h>
+#include "os-shared-binsem.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_BinSemAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c
index 27339e688..464843b13 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-common.h>
-#include <OCS_semLib.h>
+#include "os-shared-common.h"
+#include "OCS_semLib.h"
 
 UT_DEFAULT_STUB(OS_API_Impl_Init, (osal_objtype_t idtype))
 
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c
index 27d5023e9..2aee6b7e3 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-countsem.h>
+#include "os-shared-countsem.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_CountSemAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c
index f1ec0f712..5aea2429f 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-dir.h>
+#include "os-shared-dir.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_DirAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c
index edf5907f3..ccdf80fbb 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-file.h>
+#include "os-shared-file.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_StreamAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c
index 67d208541..f28c9cb54 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-module.h>
+#include "os-shared-module.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_ModuleAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c
index 51a24f577..1314327af 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-mutex.h>
+#include "os-shared-mutex.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_MutexAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c
index 86833b867..e6b727e49 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-queue.h>
+#include "os-shared-queue.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_QueueAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c
index d3ddbba47..4cd1debf8 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-task.h>
+#include "os-shared-task.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_TaskAPI_Impl_Init, (void))
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c
index 465f316a0..228ae5921 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c
@@ -28,6 +28,6 @@
 #include <stdlib.h>
 #include "utstubs.h"
 
-#include <os-shared-timebase.h>
+#include "os-shared-timebase.h"
 
 UT_DEFAULT_STUB(OS_VxWorks_TimeBaseAPI_Impl_Init, (void))
diff --git a/ut_assert/inc/utassert.h b/ut_assert/inc/utassert.h
index 8bf875cf3..a04316431 100644
--- a/ut_assert/inc/utassert.h
+++ b/ut_assert/inc/utassert.h
@@ -95,6 +95,9 @@ typedef struct
 /* Asserts a test failure */
 #define UtAssert_Failed(...) UtAssertEx(false, UtAssert_GetContext(), __FILE__, __LINE__, __VA_ARGS__)
 
+/* Assert a test Not Applicable */
+#define UtAssert_NA(...) UtAssertEx(false, UTASSERT_CASETYPE_NA, __FILE__, __LINE__, __VA_ARGS__)
+
 /* Compares two integers and determines if they are equal within a specified absolute tolerance. */
 #define UtAssert_IntegerCmpAbs(x, y, Tolerance, ...) \
     UtAssertEx((abs((x) - (y)) <= (Tolerance)), UtAssert_GetContext(), __FILE__, __LINE__, __VA_ARGS__)