diff --git a/modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp b/modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp
index 73ad6164f..6d94adb4c 100644
--- a/modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp
+++ b/modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp
@@ -6,7 +6,6 @@
 \*************************************************************************/
 
 #include <algorithm>
-#include <limits>
 #include <string>
 #include <set>
 
diff --git a/modules/libcom/test/epicsStringTest.c b/modules/libcom/test/epicsStringTest.c
index a1c2874fb..33110434a 100644
--- a/modules/libcom/test/epicsStringTest.c
+++ b/modules/libcom/test/epicsStringTest.c
@@ -148,8 +148,8 @@ void testTok(const char *inp,
              const char *expectTok,
              const char *expectSave)
 {
-    char *scratch = !inp ? NULL : strdup(inp);
-    char *allocSave = !save ? NULL : strdup(save);
+    char *scratch = !inp ? NULL : epicsStrDup(inp);
+    char *allocSave = !save ? NULL : epicsStrDup(save);
     char *actualSave = allocSave;
     char *actualTok;