diff --git a/src/pv/pvData.h b/src/pv/pvData.h
index ff2582e..1106354 100644
--- a/src/pv/pvData.h
+++ b/src/pv/pvData.h
@@ -33,31 +33,6 @@
 typedef class std::ios std::ios_base;
 #endif
 
-/* C++11 keywords
- @code
- struct Base {
-   virtual void foo();
- };
- struct Class : public Base {
-   virtual void foo() OVERRIDE FINAL;
- };
- @endcode
- */
-#ifndef FINAL
-#  if __cplusplus>=201103L
-#    define FINAL final
-#  else
-#    define FINAL
-#  endif
-#endif
-#ifndef OVERRIDE
-#  if __cplusplus>=201103L
-#    define OVERRIDE override
-#  else
-#    define OVERRIDE
-#  endif
-#endif
-
 namespace epics { namespace pvData { 
 
 /** @defgroup pvcontainer Value containers
diff --git a/src/pv/pvIntrospect.h b/src/pv/pvIntrospect.h
index 384671b..a9bd432 100644
--- a/src/pv/pvIntrospect.h
+++ b/src/pv/pvIntrospect.h
@@ -21,6 +21,31 @@
 
 #include <shareLib.h>
 
+/* C++11 keywords
+ @code
+ struct Base {
+   virtual void foo();
+ };
+ struct Class : public Base {
+   virtual void foo() OVERRIDE FINAL;
+ };
+ @endcode
+ */
+#ifndef FINAL
+#  if __cplusplus>=201103L
+#    define FINAL final
+#  else
+#    define FINAL
+#  endif
+#endif
+#ifndef OVERRIDE
+#  if __cplusplus>=201103L
+#    define OVERRIDE override
+#  else
+#    define OVERRIDE
+#  endif
+#endif
+
 namespace epics { namespace pvData { 
 
 namespace format {