diff --git a/src/libCom/osi/epicsThread.cpp b/src/libCom/osi/epicsThread.cpp
index 052609c2f..6d0ba6421 100644
--- a/src/libCom/osi/epicsThread.cpp
+++ b/src/libCom/osi/epicsThread.cpp
@@ -15,10 +15,10 @@
 #include <exception>
 #include <typeinfo>
 
-#include <cstdio>
-#include <cstddef>
-#include <cfloat>
-#include <cstring>
+#include <stdio.h>
+#include <stddef.h>
+#include <float.h>
+#include <string.h>
 
 #define epicsExportSharedSymbols
 #include "epicsAlgorithm.h"
diff --git a/src/libCom/timer/timerQueue.cpp b/src/libCom/timer/timerQueue.cpp
index 5f7929118..cbccd8ffa 100644
--- a/src/libCom/timer/timerQueue.cpp
+++ b/src/libCom/timer/timerQueue.cpp
@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
@@ -14,8 +13,8 @@
  *              505 665 1831
  */
 
-#include <cstdio>
-#include <cfloat>
+#include <stdio.h>
+#include <float.h>
 
 #define epicsExportSharedSymbols
 #include "epicsGuard.h"