diff --git a/src/libCom/osi/compiler/gcc/epicsAtomicCD.h b/src/libCom/osi/compiler/gcc/epicsAtomicCD.h
index 949def6d0..c706a31a0 100644
--- a/src/libCom/osi/compiler/gcc/epicsAtomicCD.h
+++ b/src/libCom/osi/compiler/gcc/epicsAtomicCD.h
@@ -52,7 +52,7 @@ extern "C" {
 
 /* 
  * We are optimistic that __sync_synchronize is implemented
- * in all version four gcc invarient of target. The gnu doc 
+ * in all version four gcc invariant of target. The gnu doc 
  * seems to say that when not supported by architecture a call
  * to an external function is generated but in practice
  * this isn`t the case for some of the atomic intrinsics, and 
diff --git a/src/libCom/osi/epicsAtomic.h b/src/libCom/osi/epicsAtomic.h
index c4ff6d65f..f3d509f56 100644
--- a/src/libCom/osi/epicsAtomic.h
+++ b/src/libCom/osi/epicsAtomic.h
@@ -94,12 +94,12 @@ epicsShareFunc EpicsAtomicPtrT epicsAtomicCmpAndSwapPtrT (
 #endif
 
 /*
- * options for inline compiler instrinsic or os specific 
+ * options for in-line compiler intrinsic or OS specific 
  * implementations of the above function prototypes
  *
  * for some of the compilers we must define the
- * inline functions before they get used in the c++ 
- * inine functions below
+ * in-line functions before they get used in the c++ 
+ * in-line functions below
  */
 #include "epicsAtomicCD.h"
 
@@ -228,8 +228,8 @@ inline EpicsAtomicPtrT compareAndSwap ( EpicsAtomicPtrT & v,
     return epicsAtomicCmpAndSwapPtrT ( & v, oldVal, newVal );
 }
 
-} /* end of namespace atomic */
-} /* end of namespace epics */ 
+} /* end of name space atomic */
+} /* end of name space epics */ 
 
 #endif /* ifdef __cplusplus */
 
diff --git a/src/libCom/osi/os/WIN32/epicsAtomicOSD.h b/src/libCom/osi/os/WIN32/epicsAtomicOSD.h
index 00b6cc606..ebd1124c7 100644
--- a/src/libCom/osi/os/WIN32/epicsAtomicOSD.h
+++ b/src/libCom/osi/os/WIN32/epicsAtomicOSD.h
@@ -16,10 +16,28 @@
 #ifndef epicsAtomicOSD_h
 #define epicsAtomicOSD_h
 
-#define VC_EXTRALEAN
-#define STRICT
+#ifdef VC_EXTRALEAN
+#   define VC_EXTRALEAN_DETECTED_epicsAtomicOSD_h
+#else
+#   define VC_EXTRALEAN
+#endif
+
+#ifdef STRICT
+#   define STRICT_DETECTED_epicsAtomicOSD_h
+#else
+#   define STRICT
+#endif
+
 #include "windows.h"
 
+#ifndef VC_EXTRALEAN_DETECTED_epicsAtomicOSD_h
+#   undef VC_EXTRALEAN
+#endif
+
+#ifndef STRICT_DETECTED_epicsAtomicOSD_h
+#   undef STRICT
+#endif
+
 #if defined ( _WIN64 )
 #    define MS_ATOMIC_64
 #endif
diff --git a/src/libCom/osi/os/posix/epicsAtomicOSD.cpp b/src/libCom/osi/os/posix/epicsAtomicOSD.cpp
index a8173f894..6e94cbcc4 100644
--- a/src/libCom/osi/os/posix/epicsAtomicOSD.cpp
+++ b/src/libCom/osi/os/posix/epicsAtomicOSD.cpp
@@ -29,11 +29,11 @@
 
 /*
  * Slow, but probably correct on all systems.
- * Useful only if something more efficent isnt 
+ * Useful only if something more efficient isn`t 
  * provided based on knowledge of the compiler 
  * or OS 
  *
- * A statically initialized pthread mutex doesnt 
+ * A statically initialized pthread mutex doesn`t 
  * need to be destroyed 
  * 
  * !!!!!
@@ -42,7 +42,7 @@
  * !!!!! Do not use this implementation on systems where
  * !!!!! code runs at interrupt context. If so, then 
  * !!!!! an implementation must be provided that is based
- * !!!!! on a compiler intrinsic or an interrpt lock and or
+ * !!!!! on a compiler intrinsic or an interrupt lock and or
  * !!!!! a spin lock primitive
  * !!!!!
  */
@@ -73,7 +73,7 @@ void epicsAtomicUnlock ( EpicsAtomicLockKey * )
 
 #ifndef EPICS_ATOMIC_READ_MEMORY_BARRIER
 // Slow, but probably correct on all systems.
-// Useful only if something more efficent isnt 
+// Useful only if something more efficient isn`t 
 // provided based on knowledge of the compiler 
 // or OS 
 void epicsAtomicReadMemoryBarrier ()
@@ -86,7 +86,7 @@ void epicsAtomicReadMemoryBarrier ()
 
 #ifndef EPICS_ATOMIC_WRITE_MEMORY_BARRIER
 // Slow, but probably correct on all systems.
-// Useful only if something more efficent isnt 
+// Useful only if something more efficient isn`t 
 // provided based on knowledge of the compiler 
 // or OS 
 void epicsAtomicWriteMemoryBarrier ()