diff --git a/src/factory/FieldCreateFactory.cpp b/src/factory/FieldCreateFactory.cpp
index ca53544..643ec6e 100644
--- a/src/factory/FieldCreateFactory.cpp
+++ b/src/factory/FieldCreateFactory.cpp
@@ -26,6 +26,7 @@
 #include <pv/pvIntrospect.h>
 #include <pv/factory.h>
 #include <pv/serializeHelper.h>
+#include <pv/localStaticLock.h>
 
 using std::tr1::static_pointer_cast;
 using std::size_t;
diff --git a/src/misc/pv/thread.h b/src/misc/pv/thread.h
index 5b964e5..6b0e3b2 100644
--- a/src/misc/pv/thread.h
+++ b/src/misc/pv/thread.h
@@ -11,6 +11,7 @@
 
 #include <memory>
 #include <sstream>
+#include <stdexcept>
 
 #if __cplusplus>=201103L
 #include <functional>
diff --git a/src/pv/pvType.h b/src/pv/pvType.h
index d1131ba..efa4052 100644
--- a/src/pv/pvType.h
+++ b/src/pv/pvType.h
@@ -39,7 +39,6 @@ typedef unsigned int uintptr_t;
 #endif
 
 #include <pv/sharedPtr.h>
-#include <pv/localStaticLock.h>
 
 //! epics
 namespace epics {