diff --git a/tools/testtools/csvdiff.cpp b/tools/testtools/csvdiff.cpp
index 3fbe55edf..3defb1a6e 100644
--- a/tools/testtools/csvdiff.cpp
+++ b/tools/testtools/csvdiff.cpp
@@ -258,7 +258,7 @@ static void get_sizes(FILE *fp, int &nTitleLines, int &nColTitleLines,
      * Strip a trailing comma from the scanline -
      *  -> These are not significant
      */
-    int ccount = strlen(scanLine);
+    int ccount = static_cast<int>(strlen(scanLine));
     if (ccount > 0) {
       if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
     }
@@ -293,7 +293,7 @@ static void get_sizes(FILE *fp, int &nTitleLines, int &nColTitleLines,
      * Strip a trailing comma from the scanline -
      *  -> These are not significant
      */
-    int ccount = strlen(scanLine);
+    int ccount = static_cast<int>(strlen(scanLine));
     if (ccount > 0) {
       if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
     }
@@ -347,7 +347,7 @@ static void get_sizes(FILE *fp, int &nTitleLines, int &nColTitleLines,
        * Strip a trailing comma from the scanline -
        *  -> These are not significant
        */
-      int ccount = strlen(scanLine);
+      int ccount = static_cast<int>(strlen(scanLine));
       if (ccount > 0) {
 	if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
       }
@@ -398,7 +398,7 @@ read_title(FILE *fp, char ***title, int nTitleLines)
 	 * Strip a trailing comma from the scanline -
 	 *  -> These are not significant
 	 */
-	int ccount = strlen(scanLine);
+	int ccount = static_cast<int>(strlen(scanLine));
 	if (ccount > 0) {
 	  if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
 	}
@@ -427,7 +427,7 @@ read_colTitle(FILE *fp,  char ****ColMLNames_ptr, int  nColTitleLines, int nCol)
        * Strip a trailing comma from the scanline -
        *  -> These are not significant
        */
-       int ccount = strlen(scanLine);
+       int ccount = static_cast<int>(strlen(scanLine));
        if (ccount > 0) {
 	 if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
        }
@@ -483,7 +483,7 @@ read_values(FILE *fp, double **NVValues, int nCol, int nDataRows)
      * Strip a trailing comma from the scanline -
      *  -> These are not significant
      */
-    int ccount = strlen(scanLine);
+    int ccount = static_cast<int>(strlen(scanLine));
     if (ccount > 0) {
       if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
     }
diff --git a/tools/testtools/mdp_allo.cpp b/tools/testtools/mdp_allo.cpp
index c71d9c42d..f2bd4eb86 100644
--- a/tools/testtools/mdp_allo.cpp
+++ b/tools/testtools/mdp_allo.cpp
@@ -220,16 +220,7 @@ static double *smalloc(size_t n);
 /****************************************************************************/
 /****************************************************************************/
 
-#ifdef __STDC__
-double *mdp_array_alloc(int numdim, ...)   
-#else
-double *mdp_array_alloc(va_alist)
-    va_dcl    
-#endif
-
-/****************************************************************************/
-/****************************************************************************/
-/****************************************************************************/
+double *mdp_array_alloc(int numdim, ...)
 {
   int i, j;
   struct dim {
diff --git a/tools/testtools/mdp_allo.h b/tools/testtools/mdp_allo.h
index bf12cfa96..4acf83116 100644
--- a/tools/testtools/mdp_allo.h
+++ b/tools/testtools/mdp_allo.h
@@ -16,6 +16,7 @@
 #ifndef MDP_ALLO_H
 #define MDP_ALLO_H
 
+#include <string.h>
 /*****************************************************************************/
 /*
 *  If we have array_alloc() from another Sandia program, we will not use