diff --git a/src/libCom/osi/compiler/clang/epicsAtomicCD.h b/src/libCom/osi/compiler/clang/epicsAtomicCD.h
index ecb3833d1..fea011561 100644
--- a/src/libCom/osi/compiler/clang/epicsAtomicCD.h
+++ b/src/libCom/osi/compiler/clang/epicsAtomicCD.h
@@ -13,8 +13,8 @@
  *  johill@lanl.gov
  */
 
-#ifndef cdAtomic_h
-#define cdAtomic_h
+#ifndef epicsAtomicCD_h
+#define epicsAtomicCD_h
 
 #if defined ( __cplusplus )
 #   define OSD_ATOMIC_INLINE inline
@@ -22,6 +22,6 @@
 #   define OSD_ATOMIC_INLINE __inline__
 #endif
 
-#include "osdAtomic.h"
+#include "epicsAtomicOSD.h"
 
-#endif /* cdAtomic_h */
+#endif /* epicsAtomicCD_h */
diff --git a/src/libCom/osi/compiler/default/epicsAtomicCD.h b/src/libCom/osi/compiler/default/epicsAtomicCD.h
index a4edb81c9..60171e377 100644
--- a/src/libCom/osi/compiler/default/epicsAtomicCD.h
+++ b/src/libCom/osi/compiler/default/epicsAtomicCD.h
@@ -13,13 +13,13 @@
  *  johill@lanl.gov
  */
 
-#ifndef cdAtomic_h
-#define cdAtomic_h
+#ifndef epicsAtomicCD_h
+#define epicsAtomicCD_h
 
 #if __STDC_VERSION__ >= 199901L || defined ( __cplusplus )
 #   define OSD_ATOMIC_INLINE inline
 #endif
 
-#include "osdAtomic.h"
+#include "epicsAtomicOSD.h"
 
-#endif /* cdAtomic_h */
+#endif /* epicsAtomicCD_h */
diff --git a/src/libCom/osi/compiler/gcc/epicsAtomicCD.h b/src/libCom/osi/compiler/gcc/epicsAtomicCD.h
index 364a86e0d..f725a23cb 100644
--- a/src/libCom/osi/compiler/gcc/epicsAtomicCD.h
+++ b/src/libCom/osi/compiler/gcc/epicsAtomicCD.h
@@ -13,8 +13,8 @@
  *  johill@lanl.gov
  */
 
-#ifndef cdAtomic_h
-#define cdAtomic_h
+#ifndef epicsAtomicCD_h
+#define epicsAtomicCD_h
 
 #ifndef __GNUC__
 #   error this header is only for use with the gnu compiler
@@ -90,8 +90,8 @@ OSD_ATOMIC_INLINE unsigned epicsAtomicTestAndSetUIntT ( unsigned * pTarget )
      * not available as gcc intrinsics so we
      * will employ an os specific inline solution
      */
-#   include "osdAtomic.h"
+#   include "epicsAtomicOSD.h"
 
 #endif /* if GCC_ATOMIC_INTRINSICS_AVAIL */
 
-#endif /* cdAtomic_h */
+#endif /* epicsAtomicCD_h */
diff --git a/src/libCom/osi/compiler/msvc/epicsAtomicCD.h b/src/libCom/osi/compiler/msvc/epicsAtomicCD.h
index 1353d121e..17a3bec9a 100644
--- a/src/libCom/osi/compiler/msvc/epicsAtomicCD.h
+++ b/src/libCom/osi/compiler/msvc/epicsAtomicCD.h
@@ -13,8 +13,8 @@
  *  johill@lanl.gov
  */
 
-#ifndef cdAtomic_h
-#define cdAtomic_h
+#ifndef epicsAtomicCD_h
+#define epicsAtomicCD_h
 
 #include "epicsAssert.h"
 
@@ -157,9 +157,9 @@ OSD_ATOMIC_INLINE size_t epicsAtomicGetSizeT ( const size_t * pTarget )
 
 #if defined ( __cplusplus )
 #   define OSD_ATOMIC_INLINE inline
-#   include "osdAtomic.h"
+#   include "epicsAtomicOSD.h"
 #endif
 
 #endif /* ifdef _MSC_EXTENSIONS */
 
-#endif /* cdAtomic_h */
+#endif /* epicsAtomicCD_h */
diff --git a/src/libCom/osi/compiler/solStudio/epicsAtomicCD.h b/src/libCom/osi/compiler/solStudio/epicsAtomicCD.h
index a69bb19bb..c72a3e203 100644
--- a/src/libCom/osi/compiler/solStudio/epicsAtomicCD.h
+++ b/src/libCom/osi/compiler/solStudio/epicsAtomicCD.h
@@ -13,8 +13,8 @@
  *  johill@lanl.gov
  */
 
-#ifndef cdAtomic_h
-#define cdAtomic_h
+#ifndef epicsAtomicCD_h
+#define epicsAtomicCD_h
 
 #if defined ( __cplusplus )
 #   define OSD_ATOMIC_INLINE inline
@@ -22,6 +22,6 @@
 #   define OSD_ATOMIC_INLINE __inline
 #endif
 
-#include "osdAtomic.h"
+#include "epicsAtomicOSD.h"
 
-#endif /* cdAtomic_h */
+#endif /* epicsAtomicCD_h */