diff --git a/src/core/ddsi/src/ddsi_eth.c b/src/core/ddsi/src/ddsi_eth.c
index f821832..af3eff1 100644
--- a/src/core/ddsi/src/ddsi_eth.c
+++ b/src/core/ddsi/src/ddsi_eth.c
@@ -13,7 +13,6 @@
 
 int ddsi_eth_enumerate_interfaces(ddsi_tran_factory_t fact, os_ifaddrs_t **ifs)
 {
-    int err;
     int afs[] = { AF_INET, 0 };
 
     (void)fact;
diff --git a/src/core/ddsi/src/ddsi_raweth.c b/src/core/ddsi/src/ddsi_raweth.c
index ddf6c90..87e9352 100644
--- a/src/core/ddsi/src/ddsi_raweth.c
+++ b/src/core/ddsi/src/ddsi_raweth.c
@@ -349,7 +349,6 @@ static void ddsi_raweth_deinit(void)
 
 static int ddsi_raweth_enumerate_interfaces (ddsi_tran_factory_t factory, os_ifaddrs_t **interfs)
 {
-  int err = 0;
   int afs[] = { AF_PACKET, 0 };
 
   (void)factory;
diff --git a/src/os/include/os/os_socket.h b/src/os/include/os/os_socket.h
index b378530..230279b 100644
--- a/src/os/include/os/os_socket.h
+++ b/src/os/include/os/os_socket.h
@@ -280,8 +280,8 @@ extern "C" {
     */
     OSAPI_EXPORT int
     os_sockaddr_compare(
-        const os_sockaddr *sa1,
-        const os_sockaddr *sa2) __nonnull_all__ __attribute_pure__;
+        const os_sockaddr *const sa1,
+        const os_sockaddr *const sa2) __nonnull_all__ __attribute_pure__;
 
     /**
      * FIXME: comment
diff --git a/src/os/src/os_socket.c b/src/os/src/os_socket.c
index 23f7de5..82b8988 100644
--- a/src/os/src/os_socket.c
+++ b/src/os/src/os_socket.c
@@ -46,7 +46,7 @@ const os_in6_addr os_in6addr_loopback = { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }
 #endif
 
 size_t
-os_sockaddr_size(const os_sockaddr *sa)
+os_sockaddr_size(const os_sockaddr *const sa)
 {
     size_t sz;
 
@@ -72,7 +72,7 @@ os_sockaddr_size(const os_sockaddr *sa)
     return sz;
 }
 
-uint16_t os_sockaddr_get_port(const os_sockaddr *sa)
+uint16_t os_sockaddr_get_port(const os_sockaddr *const sa)
 {
     unsigned short port = 0;
 
@@ -91,7 +91,9 @@ uint16_t os_sockaddr_get_port(const os_sockaddr *sa)
     return port;
 }
 
-int os_sockaddr_compare(const os_sockaddr *sa1, const os_sockaddr *sa2)
+int os_sockaddr_compare(
+    const os_sockaddr *const sa1,
+    const os_sockaddr *const sa2)
 {
     int eq;
     size_t sz;
diff --git a/src/os/src/snippets/code/os_stdlib_strcasecmp.c b/src/os/src/snippets/code/os_stdlib_strcasecmp.c
index ae1e250..a784b8e 100644
--- a/src/os/src/snippets/code/os_stdlib_strcasecmp.c
+++ b/src/os/src/snippets/code/os_stdlib_strcasecmp.c
@@ -11,7 +11,9 @@
  */
 #include "os/os.h"
 
+#ifdef _MSC_VER
 #pragma warning( default : 4996 )
+#endif /* _MSC_VER */
 int
 os_strcasecmp(
     const char *s1,
diff --git a/src/os/tests/ifaddrs.c b/src/os/tests/ifaddrs.c
index 2282a5e..cff5188 100644
--- a/src/os/tests/ifaddrs.c
+++ b/src/os/tests/ifaddrs.c
@@ -28,7 +28,7 @@ CUnit_Suite_Cleanup(os_getifaddrs)
     return 0;
 }
 
-/* Assume every test machine has at least one non-loopback IPv4 address. This
+/* Assume every test machine has at least one IPv4 enabled interface. This
    simple test verifies an interface can at least be found and that the
    IFF_LOOPBACK flags are properly set. */
 CUnit_Test(os_getifaddrs, ipv4)