3 files changed, 11 insertions, 1 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 52ba2b55c..a1d8890db 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -265,7 +265,7 @@ softare-based entropy polling is still used.
   #define BOTAN_DEPRECATED(msg)
 #endif
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
   // noexcept is not supported in VS 2013
   #include <yvals.h>
   #define BOTAN_NOEXCEPT _NOEXCEPT
diff --git a/src/lib/prov/tpm/tpm.h b/src/lib/prov/tpm/tpm.h
index ce5eabe1c..7df232be3 100644
--- a/src/lib/prov/tpm/tpm.h
+++ b/src/lib/prov/tpm/tpm.h
@@ -5,6 +5,9 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
+#ifndef BOTAN_TPM_H__
+#define BOTAN_TPM_H__
+
 #include <botan/exceptn.h>
 #include <botan/pk_keys.h>
 #include <botan/bigint.h>
@@ -180,3 +183,5 @@ class BOTAN_DLL TPM_PrivateKey : public Private_Key
 // TODO: PCR measurement, writing, key locking
 
 }
+
+#endif
diff --git a/src/lib/prov/tpm/uuid.h b/src/lib/prov/tpm/uuid.h
index 3c35da1f4..0094f4f83 100644
--- a/src/lib/prov/tpm/uuid.h
+++ b/src/lib/prov/tpm/uuid.h
@@ -5,6 +5,9 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
+#ifndef BOTAN_UUID_H__
+#define BOTAN_UUID_H__
+
 #include <botan/secmem.h>
 #include <botan/hex.h>
 #include <sstream>
@@ -99,3 +102,5 @@ class UUID
    };
 
 }
+
+#endif