25 files changed, 88 insertions, 58 deletions
diff --git a/lib/nettle/backport/cfb8.h b/lib/nettle/backport/cfb8.h
index c0a452ca04..351b46f73f 100644
--- a/lib/nettle/backport/cfb8.h
+++ b/lib/nettle/backport/cfb8.h
@@ -32,8 +32,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_CFB8_H_INCLUDED
-#define NETTLE_CFB8_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_BACKPORT_CFB8_H
+#define GNUTLS_LIB_NETTLE_BACKPORT_CFB8_H
 
 #include <nettle/cfb.h>
 
@@ -93,4 +93,5 @@ cfb8_decrypt(const void *ctx, nettle_cipher_func *f,
 #ifdef __cplusplus
 }
 #endif
-#endif /* NETTLE_CFB8_H_INCLUDED */
+
+#endif /* GNUTLS_LIB_NETTLE_BACKPORT_CFB8_H */
diff --git a/lib/nettle/backport/cmac.h b/lib/nettle/backport/cmac.h
index 85939ce682..41dbfcf31b 100644
--- a/lib/nettle/backport/cmac.h
+++ b/lib/nettle/backport/cmac.h
@@ -33,8 +33,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_CMAC_H_INCLUDED
-#define NETTLE_CMAC_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_BACKPORT_CMAC_H
+#define GNUTLS_LIB_NETTLE_BACKPORT_CMAC_H
 
 #include <nettle/nettle-types.h>
 
@@ -136,5 +136,4 @@ cmac_aes256_digest(struct cmac_aes256_ctx *ctx,
 }
 #endif
 
-#endif /* CMAC_H_INCLUDED */
-
+#endif /* GNUTLS_LIB_NETTLE_BACKPORT_CMAC_H */
diff --git a/lib/nettle/backport/xts.h b/lib/nettle/backport/xts.h
index 5111af0f38..238e31272a 100644
--- a/lib/nettle/backport/xts.h
+++ b/lib/nettle/backport/xts.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _BACKPORT_NETTLE_XTS_H_INCLUDED
-#define _BACKPORT_NETTLE_XTS_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_BACKPORT_XTS_H
+#define GNUTLS_LIB_NETTLE_BACKPORT_XTS_H
 
 #ifdef HAVE_XTS_ENCRYPT_MESSAGE
 #include <nettle/xts.h>
@@ -119,4 +119,4 @@ xts_aes256_decrypt_message(struct xts_aes256_key *xts_key,
 
 #endif /* HAVE_XTS_ENCRYPT_MESSAGE */
 
-#endif /* _BACKPORT_NETTLE_XTS_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_BACKPORT_XTS_H */
diff --git a/lib/nettle/gnettle.h b/lib/nettle/gnettle.h
index e27149c3ea..f47569bfc6 100644
--- a/lib/nettle/gnettle.h
+++ b/lib/nettle/gnettle.h
@@ -1,3 +1,8 @@
+#ifndef GNUTLS_LIB_NETTLE_GNETTLE_H
+#define GNUTLS_LIB_NETTLE_GNETTLE_H
+
 #define PRIME_CHECK_PARAM 8
 #define TOMPZ(x) ((__mpz_struct*)(x))
 #define SIZEOF_MPZT sizeof(__mpz_struct)
+
+#endif /* GNUTLS_LIB_NETTLE_GNETTLE_H */
diff --git a/lib/nettle/gost/bignum-le.h b/lib/nettle/gost/bignum-le.h
index 009679f79a..3672ad2ef3 100644
--- a/lib/nettle/gost/bignum-le.h
+++ b/lib/nettle/gost/bignum-le.h
@@ -31,8 +31,8 @@
    not, see https://www.gnu.org/licenses/.
 */
  
-#ifndef NETTLE_BIGNUM_LE_H_INCLUDED
-#define NETTLE_BIGNUM_LE_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_BIGNUM_LE_H
+#define GNUTLS_LIB_NETTLE_GOST_BIGNUM_LE_H
 
 #include <nettle/nettle-meta.h>
 
@@ -68,4 +68,4 @@ nettle_mpz_init_set_str_256_u_le(mpz_t x,
 }
 #endif
 
-#endif /* NETTLE_BIGNUM_LE_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_BIGNUM_LE_H */
diff --git a/lib/nettle/gost/ecc-gost-curve.h b/lib/nettle/gost/ecc-gost-curve.h
index ae68437ca0..9e972c7689 100644
--- a/lib/nettle/gost/ecc-gost-curve.h
+++ b/lib/nettle/gost/ecc-gost-curve.h
@@ -31,8 +31,8 @@
 
 /* Development of Nettle's ECC support was funded by the .SE Internet Fund. */
 
-#ifndef NETTLE_ECC_GOST_CURVE_H_INCLUDED
-#define NETTLE_ECC_GOST_CURVE_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_ECC_GOST_CURVE_H
+#define GNUTLS_LIB_NETTLE_GOST_ECC_GOST_CURVE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,4 +58,4 @@ const struct ecc_curve * NETTLE_PURE nettle_get_gost_512a(void);
 }
 #endif
 
-#endif /* NETTLE_ECC_GOST_CURVE_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_ECC_GOST_CURVE_H */
diff --git a/lib/nettle/gost/ecc-gost256cpa-32.h b/lib/nettle/gost/ecc-gost256cpa-32.h
index 33d9fe41ae..bdd5b480d5 100644
--- a/lib/nettle/gost/ecc-gost256cpa-32.h
+++ b/lib/nettle/gost/ecc-gost256cpa-32.h
@@ -1,3 +1,6 @@
+#ifndef GNUTLS_LIB_NETTLE_GOST_ECC_GOST256CPA_32_H
+#define GNUTLS_LIB_NETTLE_GOST_ECC_GOST256CPA_32_H
+
 /* For NULL. */
 #include <stddef.h>
 #define ECC_LIMB_SIZE 8
@@ -1069,3 +1072,5 @@ static const mp_limb_t ecc_table[4096] = {
   0x22753b51UL, 0xc2081d24UL, 0xf3beada6UL, 0xfca3e2e2UL, 0x1cd6ca20UL, 0x5ab1f143UL, 0x4c73315aUL, 0x1c40a0a3UL,
 };
 #endif
+
+#endif /* GNUTLS_LIB_NETTLE_GOST_ECC_GOST256CPA_32_H */
diff --git a/lib/nettle/gost/ecc-gost256cpa-64.h b/lib/nettle/gost/ecc-gost256cpa-64.h
index 64659d7adc..8f8c557f31 100644
--- a/lib/nettle/gost/ecc-gost256cpa-64.h
+++ b/lib/nettle/gost/ecc-gost256cpa-64.h
@@ -1,3 +1,6 @@
+#ifndef GNUTLS_LIB_NETTLE_GOST_ECC_GOST256CPA_64_H
+#define GNUTLS_LIB_NETTLE_GOST_ECC_GOST256CPA_64_H
+
 /* For NULL. */
 #include <stddef.h>
 #define ECC_LIMB_SIZE 4
@@ -1069,3 +1072,5 @@ static const mp_limb_t ecc_table[2048] = {
   0xc2081d2422753b51ULL, 0xfca3e2e2f3beada6ULL, 0x5ab1f1431cd6ca20ULL, 0x1c40a0a34c73315aULL,
 };
 #endif
+
+#endif /* GNUTLS_LIB_NETTLE_GOST_ECC_GOST256CPA_64_H */
diff --git a/lib/nettle/gost/ecc-gost512a-32.h b/lib/nettle/gost/ecc-gost512a-32.h
index 59e09230cb..b401d83a9b 100644
--- a/lib/nettle/gost/ecc-gost512a-32.h
+++ b/lib/nettle/gost/ecc-gost512a-32.h
@@ -1,3 +1,6 @@
+#ifndef GNUTLS_LIB_NETTLE_GOST_ECC_GOST512A_32_H
+#define GNUTLS_LIB_NETTLE_GOST_ECC_GOST512A_32_H
+
 /* For NULL. */
 #include <stddef.h>
 #define ECC_LIMB_SIZE 16
@@ -1079,3 +1082,5 @@ static const mp_limb_t ecc_table[4096] = {
   0xebf08ccdUL, 0xfa5a5e9bUL, 0x1514341bUL, 0xf3fa901eUL, 0x7274c4deUL, 0x58450d39UL, 0x3d7994ddUL, 0x11e797e3UL,
 };
 #endif
+
+#endif /* GNUTLS_LIB_NETTLE_GOST_ECC_GOST512A_32_H */
diff --git a/lib/nettle/gost/ecc-gost512a-64.h b/lib/nettle/gost/ecc-gost512a-64.h
index a9cd1498c0..4b2181a9fb 100644
--- a/lib/nettle/gost/ecc-gost512a-64.h
+++ b/lib/nettle/gost/ecc-gost512a-64.h
@@ -1,3 +1,6 @@
+#ifndef GNUTLS_LIB_NETTLE_GOST_ECC_GOST512A_64_H
+#define GNUTLS_LIB_NETTLE_GOST_ECC_GOST512A_64_H
+
 /* For NULL. */
 #include <stddef.h>
 #define ECC_LIMB_SIZE 8
@@ -557,3 +560,5 @@ static const mp_limb_t ecc_table[2048] = {
   0x985a33a6204a4502ULL, 0x8b918c4eda502eb1ULL, 0x8026596480a17e66ULL, 0x173aeb7d9492eafbULL, 0xfa5a5e9bebf08ccdULL, 0xf3fa901e1514341bULL, 0x58450d397274c4deULL, 0x11e797e33d7994ddULL,
 };
 #endif
+
+#endif /* GNUTLS_LIB_NETTLE_GOST_ECC_GOST512A_64_H */
diff --git a/lib/nettle/gost/ecc-internal.h b/lib/nettle/gost/ecc-internal.h
index 70392aa7fb..a553983c9d 100644
--- a/lib/nettle/gost/ecc-internal.h
+++ b/lib/nettle/gost/ecc-internal.h
@@ -31,8 +31,8 @@
 
 /* Development of Nettle's ECC support was funded by the .SE Internet Fund. */
 
-#ifndef NETTLE_GOST_ECC_INTERNAL_H_INCLUDED
-#define NETTLE_GOST_ECC_INTERNAL_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_ECC_INTERNAL_H
+#define GNUTLS_LIB_NETTLE_GOST_ECC_INTERNAL_H
 
 #include <nettle/nettle-types.h>
 #include <nettle/bignum.h>
@@ -250,4 +250,4 @@ cnd_copy (int cnd, mp_limb_t *rp, const mp_limb_t *ap, mp_size_t n);
 #endif
 #define ECC_GOSTDSA_SIGN_ITCH(size) (12*(size))
 
-#endif /* NETTLE_GOST_ECC_INTERNAL_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_ECC_INTERNAL_H */
diff --git a/lib/nettle/gost/gmp-glue.h b/lib/nettle/gost/gmp-glue.h
index ec3d4a1fd3..4b1d0932bd 100644
--- a/lib/nettle/gost/gmp-glue.h
+++ b/lib/nettle/gost/gmp-glue.h
@@ -30,8 +30,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_GMP_GLUE_H_INCLUDED
-#define NETTLE_GMP_GLUE_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_GMP_GLUE_H
+#define GNUTLS_LIB_NETTLE_GOST_GMP_GLUE_H
 
 #include <nettle/bignum.h>
 
@@ -73,4 +73,4 @@ gmp_alloc_limbs (mp_size_t n);
 void
 gmp_free_limbs (mp_limb_t *p, mp_size_t n);
 
-#endif /* NETTLE_GMP_GLUE_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_GMP_GLUE_H */
diff --git a/lib/nettle/gost/gost28147.h b/lib/nettle/gost/gost28147.h
index 1a15785017..ca45517f41 100644
--- a/lib/nettle/gost/gost28147.h
+++ b/lib/nettle/gost/gost28147.h
@@ -32,8 +32,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_GOST28147_H_INCLUDED
-#define NETTLE_GOST28147_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_GOST28147_H
+#define GNUTLS_LIB_NETTLE_GOST_GOST28147_H
 
 #include <nettle/nettle-types.h>
 
@@ -115,4 +115,4 @@ gost28147_encrypt_for_cfb(struct gost28147_ctx *ctx,
 }
 #endif
 
-#endif /* NETTLE_GOST28147_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_GOST28147_H */
diff --git a/lib/nettle/gost/gostdsa.h b/lib/nettle/gost/gostdsa.h
index aaad6520d9..9b0f517529 100644
--- a/lib/nettle/gost/gostdsa.h
+++ b/lib/nettle/gost/gostdsa.h
@@ -32,8 +32,8 @@
 
 /* Development of Nettle's ECC support was funded by the .SE Internet Fund. */
 
-#ifndef NETTLE_GOSTDSA_H_INCLUDED
-#define NETTLE_GOSTDSA_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_GOSTDSA_H
+#define GNUTLS_LIB_NETTLE_GOST_GOSTDSA_H
 
 #include <nettle/ecc.h>
 #include <nettle/dsa.h>
@@ -104,4 +104,4 @@ ecc_gostdsa_verify (const struct ecc_curve *ecc,
 }
 #endif
 
-#endif /* NETTLE_GOSTDSA_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_GOSTDSA_H */
diff --git a/lib/nettle/gost/gosthash94.h b/lib/nettle/gost/gosthash94.h
index 3eda8c2d55..091d0256ee 100644
--- a/lib/nettle/gost/gosthash94.h
+++ b/lib/nettle/gost/gosthash94.h
@@ -59,8 +59,8 @@
  * Ported to nettle by Nikos Mavrogiannopoulos.
  */
 
-#ifndef NETTLE_GOST_GOSTHASH94_H_INCLUDED
-#define NETTLE_GOST_GOSTHASH94_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_GOSTHASH94_H
+#define GNUTLS_LIB_NETTLE_GOST_GOSTHASH94_H
 
 #include <nettle/nettle-types.h>
 
@@ -92,4 +92,4 @@ extern const struct nettle_hash _gnutls_gosthash94cp;
 }
 #endif
 
-#endif /* NETTLE_GOST_GOSTHASH94_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_GOSTHASH94_H */
diff --git a/lib/nettle/gost/hmac-gost.h b/lib/nettle/gost/hmac-gost.h
index ed5b1f7967..e847cda4f0 100644
--- a/lib/nettle/gost/hmac-gost.h
+++ b/lib/nettle/gost/hmac-gost.h
@@ -31,8 +31,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_HMAC_GOST_H_INCLUDED
-#define NETTLE_HMAC_GOST_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_HMAC_GOST_H
+#define GNUTLS_LIB_NETTLE_GOST_HMAC_GOST_H
 
 #include <nettle/hmac.h>
 
@@ -100,4 +100,4 @@ hmac_streebog256_digest(struct hmac_streebog256_ctx *ctx,
 }
 #endif
 
-#endif /* NETTLE_HMAC_GOST_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_HMAC_GOST_H */
diff --git a/lib/nettle/gost/nettle-internal.h b/lib/nettle/gost/nettle-internal.h
index 2e06ebb0ff..00c899e7d4 100644
--- a/lib/nettle/gost/nettle-internal.h
+++ b/lib/nettle/gost/nettle-internal.h
@@ -32,8 +32,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_INTERNAL_H_INCLUDED
-#define NETTLE_INTERNAL_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_NETTLE_INTERNAL_H
+#define GNUTLS_LIB_NETTLE_GOST_NETTLE_INTERNAL_H
 
 /* Temporary allocation, for systems that don't support alloca. Note
  * that the allocation requests should always be reasonably small, so
@@ -49,4 +49,4 @@
   do { if ((size) > (sizeof(name) / sizeof(name[0]))) abort(); } while (0)
 #endif 
 
-#endif /* NETTLE_INTERNAL_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_NETTLE_INTERNAL_H */
diff --git a/lib/nettle/gost/nettle-write.h b/lib/nettle/gost/nettle-write.h
index 655ab10b00..f3d2b74112 100644
--- a/lib/nettle/gost/nettle-write.h
+++ b/lib/nettle/gost/nettle-write.h
@@ -31,8 +31,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_WRITE_H_INCLUDED
-#define NETTLE_WRITE_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_NETTLE_WRITE_H
+#define GNUTLS_LIB_NETTLE_GOST_NETTLE_WRITE_H
 
 /* For size_t */
 #include <stddef.h>
@@ -55,4 +55,4 @@ void
 _nettle_write_le64(size_t length, uint8_t *dst,
 		   const uint64_t *src);
 
-#endif /* NETTLE_WRITE_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_NETTLE_WRITE_H */
diff --git a/lib/nettle/gost/pbkdf2-gost.h b/lib/nettle/gost/pbkdf2-gost.h
index 840627e213..bde2014704 100644
--- a/lib/nettle/gost/pbkdf2-gost.h
+++ b/lib/nettle/gost/pbkdf2-gost.h
@@ -31,8 +31,8 @@
    not, see https://www.gnu.org/licenses/.
 */
 
-#ifndef NETTLE_PBKDF2_GOST_H_INCLUDED
-#define NETTLE_PBKDF2_GOST_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_PBKDF2_GOST_H
+#define GNUTLS_LIB_NETTLE_GOST_PBKDF2_GOST_H
 
 #include <nettle/nettle-meta.h>
 #include <nettle/pbkdf2.h>
@@ -69,4 +69,4 @@ pbkdf2_hmac_streebog512 (size_t key_length, const uint8_t *key,
 }
 #endif
 
-#endif /* NETTLE_PBKDF2_GOST_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_PBKDF2_GOST_H */
diff --git a/lib/nettle/gost/streebog.h b/lib/nettle/gost/streebog.h
index 894a143ecc..3df9b3ab67 100644
--- a/lib/nettle/gost/streebog.h
+++ b/lib/nettle/gost/streebog.h
@@ -31,8 +31,8 @@
    not, see https://www.gnu.org/licenses/.
 */
  
-#ifndef NETTLE_STREEBOG_H_INCLUDED
-#define NETTLE_STREEBOG_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_GOST_STREEBOG_H
+#define GNUTLS_LIB_NETTLE_GOST_STREEBOG_H
 
 #include <nettle/nettle-types.h>
 #include <nettle/nettle-meta.h>
@@ -102,4 +102,4 @@ extern const struct nettle_hash _gnutls_streebog512;
 }
 #endif
 
-#endif /* NETTLE_STREEBOG_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_GOST_STREEBOG_H */
diff --git a/lib/nettle/int/drbg-aes.h b/lib/nettle/int/drbg-aes.h
index 5d03929662..ac2b85860f 100644
--- a/lib/nettle/int/drbg-aes.h
+++ b/lib/nettle/int/drbg-aes.h
@@ -21,8 +21,8 @@
  * MA 02111-1301, USA.
  */
 
-#ifndef DRBG_AES_H_INCLUDED
-#define DRBG_AES_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_INT_DRBG_AES_H
+#define GNUTLS_LIB_NETTLE_INT_DRBG_AES_H
 
 #include <config.h>
 #include <nettle/aes.h>
@@ -90,4 +90,4 @@ int drbg_aes_is_seeded(struct drbg_aes_ctx *ctx);
 
 int drbg_aes_self_test(void);
 
-#endif				/* DRBG_AES_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_INT_DRBG_AES_H */
diff --git a/lib/nettle/int/dsa-fips.h b/lib/nettle/int/dsa-fips.h
index 3d2fde4057..351e856f5d 100644
--- a/lib/nettle/int/dsa-fips.h
+++ b/lib/nettle/int/dsa-fips.h
@@ -21,8 +21,8 @@
  * MA 02111-1301, USA.
  */
  
-#ifndef DSA_FIPS_H_INCLUDED
-#define DSA_FIPS_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_INT_DSA_FIPS_H
+#define GNUTLS_LIB_NETTLE_INT_DSA_FIPS_H
 
 #include <nettle/bignum.h> /* includes gmp.h */
 #include <nettle/dsa.h>
@@ -125,4 +125,4 @@ hash (uint8_t digest[DIGEST_SIZE], unsigned length, void *data)
 
 unsigned mpz_seed_sizeinbase_256_u(mpz_t s, unsigned nominal);
 
-#endif /* DSA_FIPS_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_INT_DSA_FIPS_H */
diff --git a/lib/nettle/int/rsa-fips.h b/lib/nettle/int/rsa-fips.h
index 7b1cf701d2..a2a418a788 100644
--- a/lib/nettle/int/rsa-fips.h
+++ b/lib/nettle/int/rsa-fips.h
@@ -21,8 +21,8 @@
  * MA 02111-1301, USA.
  */
 
-#ifndef RSA_FIPS_H_INCLUDED
-#define RSA_FIPS_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_INT_RSA_FIPS_H
+#define GNUTLS_LIB_NETTLE_INT_RSA_FIPS_H
 
 #include <nettle/rsa.h>
 
@@ -46,4 +46,4 @@ rsa_generate_fips186_4_keypair(struct rsa_public_key *pub,
 			       /* Desired size of modulo, in bits */
 			       unsigned n_size);
 
-#endif
+#endif /* GNUTLS_LIB_NETTLE_INT_RSA_FIPS_H */
diff --git a/lib/nettle/int/tls1-prf.h b/lib/nettle/int/tls1-prf.h
index cb9b61f9af..f5d9c82702 100644
--- a/lib/nettle/int/tls1-prf.h
+++ b/lib/nettle/int/tls1-prf.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TLS_PRF_H_INCLUDED
-#define TLS_PRF_H_INCLUDED
+#ifndef GNUTLS_LIB_NETTLE_INT_TLS1_PRF_H
+#define GNUTLS_LIB_NETTLE_INT_TLS1_PRF_H
 
 #include <nettle/nettle-meta.h>
 
@@ -47,4 +47,4 @@ tls12_prf(void *mac_ctx,
 	  size_t seed_size, const uint8_t *seed,
 	  size_t length, uint8_t *dst);
 
-#endif /* TLS_PRF_H_INCLUDED */
+#endif /* GNUTLS_LIB_NETTLE_INT_TLS1_PRF_H */
diff --git a/lib/nettle/rnd-common.h b/lib/nettle/rnd-common.h
index 898e5d7fa3..429ca017d3 100644
--- a/lib/nettle/rnd-common.h
+++ b/lib/nettle/rnd-common.h
@@ -21,6 +21,9 @@
  *
  */
 
+#ifndef GNUTLS_LIB_NETTLE_RND_COMMON_H
+#define GNUTLS_LIB_NETTLE_RND_COMMON_H
+
 #include "gnutls_int.h"
 #ifdef HAVE_GETPID
 # include <unistd.h>		/* getpid */
@@ -39,3 +42,5 @@ typedef int (*get_entropy_func)(void* rnd, size_t size);
 
 extern get_entropy_func _rnd_get_system_entropy;
 
+
+#endif /* GNUTLS_LIB_NETTLE_RND_COMMON_H */