diff --git a/src/libCom/osi/os/Darwin/epicsMath.h b/src/libCom/osi/os/Darwin/epicsMath.h
index 6dd2b87e1..d540ba5d3 100644
--- a/src/libCom/osi/os/Darwin/epicsMath.h
+++ b/src/libCom/osi/os/Darwin/epicsMath.h
@@ -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. 
 \*************************************************************************/
 
@@ -16,7 +15,15 @@
 
 #define finite(x) isfinite(x)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */
diff --git a/src/libCom/osi/os/RTEMS/epicsMath.h b/src/libCom/osi/os/RTEMS/epicsMath.h
index aeb5132be..83115f06e 100644
--- a/src/libCom/osi/os/RTEMS/epicsMath.h
+++ b/src/libCom/osi/os/RTEMS/epicsMath.h
@@ -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. 
 \*************************************************************************/
 
@@ -15,7 +14,15 @@
 #include <ieeefp.h>
 #include <shareLib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */
diff --git a/src/libCom/osi/os/VMS/epicsMath.h b/src/libCom/osi/os/VMS/epicsMath.h
index df8fba67b..03b7cf4ba 100644
--- a/src/libCom/osi/os/VMS/epicsMath.h
+++ b/src/libCom/osi/os/VMS/epicsMath.h
@@ -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. 
 \*************************************************************************/
 
@@ -16,7 +15,15 @@
 
 #define isinf(D) (!finite((D)) && !(isnan((D))))
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */
diff --git a/src/libCom/osi/os/WIN32/epicsMath.h b/src/libCom/osi/os/WIN32/epicsMath.h
index f9da1502b..33eb9dddd 100644
--- a/src/libCom/osi/os/WIN32/epicsMath.h
+++ b/src/libCom/osi/os/WIN32/epicsMath.h
@@ -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. 
 \*************************************************************************/
 
@@ -27,7 +26,15 @@
 #define isinf(D) ( !_finite(D) && !_isnan(D) ) 
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */
diff --git a/src/libCom/osi/os/hpux/epicsMath.h b/src/libCom/osi/os/hpux/epicsMath.h
index f1a8cb7c4..3ed9260e2 100644
--- a/src/libCom/osi/os/hpux/epicsMath.h
+++ b/src/libCom/osi/os/hpux/epicsMath.h
@@ -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. 
 \*************************************************************************/
 
@@ -16,7 +15,15 @@
 
 #define finite(D) (isfinite(D) != 0)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */
diff --git a/src/libCom/osi/os/osf/epicsMath.h b/src/libCom/osi/os/osf/epicsMath.h
index df8fba67b..03b7cf4ba 100644
--- a/src/libCom/osi/os/osf/epicsMath.h
+++ b/src/libCom/osi/os/osf/epicsMath.h
@@ -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. 
 \*************************************************************************/
 
@@ -16,7 +15,15 @@
 
 #define isinf(D) (!finite((D)) && !(isnan((D))))
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */
diff --git a/src/libCom/osi/os/posix/epicsMath.h b/src/libCom/osi/os/posix/epicsMath.h
index 095062f9c..b09c7024b 100644
--- a/src/libCom/osi/os/posix/epicsMath.h
+++ b/src/libCom/osi/os/posix/epicsMath.h
@@ -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,7 +13,15 @@
 #include <math.h>
 #include <shareLib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */
diff --git a/src/libCom/osi/os/solaris/epicsMath.h b/src/libCom/osi/os/solaris/epicsMath.h
index 41176401e..1cf60b5db 100644
--- a/src/libCom/osi/os/solaris/epicsMath.h
+++ b/src/libCom/osi/os/solaris/epicsMath.h
@@ -17,7 +17,15 @@
 /* same as (!isnan(x) && !finite(x)) */
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* INC_epicsMath_H */
diff --git a/src/libCom/osi/os/vxWorks/epicsMath.h b/src/libCom/osi/os/vxWorks/epicsMath.h
index acd607491..63f9af618 100644
--- a/src/libCom/osi/os/vxWorks/epicsMath.h
+++ b/src/libCom/osi/os/vxWorks/epicsMath.h
@@ -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. 
 \*************************************************************************/
 
@@ -19,7 +18,15 @@
 #define isinf(D) isInf(D)
 #define finite(D) (!isNan(D) && !isInf(D))
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 epicsShareExtern float epicsNAN;
 epicsShareExtern float epicsINF;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* epicsMathh */