diff --git a/ChangeLog b/ChangeLog
index 1b5c40336edc85653991a344aa8c83208249ca86..820f1bd5f0ee40074b1d65de00ae9d2f5ee342ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-06-25  Niels Möller  <nisse@lysator.liu.se>
 
+	* dsa.h: Include bignum.h instead of gmp.h.
+	* ecc-internal.h: Likewise.
+	* ecc.h: Likewise.
+	* gmp-glue.h: Likewise.
+	* pkcs1.h: Likewise.
+	* rsa.h: Likewise.
+
 	* testsuite/testutils.c (die): Use plain vfprintf, not
 	gmp_vfprintf.
 	(write_mpn): New function.
diff --git a/dsa.h b/dsa.h
index aa0a9bb860db94abe20dba1a42c70ece270afd3b..7aa982abf575984ecda062a765b2dbe352b848d1 100644
--- a/dsa.h
+++ b/dsa.h
@@ -34,9 +34,8 @@
 #ifndef NETTLE_DSA_H_INCLUDED
 #define NETTLE_DSA_H_INCLUDED
 
-#include <gmp.h>
-
 #include "nettle-types.h"
+#include "bignum.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ecc-internal.h b/ecc-internal.h
index a294e6cca01eb2f990607d8440c5e4dd629b51a8..3d284bd6a234be6577c931d9fb1f78cee94633e8 100644
--- a/ecc-internal.h
+++ b/ecc-internal.h
@@ -34,9 +34,8 @@
 #ifndef NETTLE_ECC_INTERNAL_H_INCLUDED
 #define NETTLE_ECC_INTERNAL_H_INCLUDED
 
-#include <gmp.h>
-
 #include "nettle-types.h"
+#include "bignum.h"
 #include "ecc-curve.h"
 #include "gmp-glue.h"
 
diff --git a/ecc.h b/ecc.h
index 0097c5f1259fced7bfd1282c78f346f854b06e6c..7293186b14997a3ca4f042b87726505c214e01b9 100644
--- a/ecc.h
+++ b/ecc.h
@@ -34,9 +34,8 @@
 #ifndef NETTLE_ECC_H_INCLUDED
 #define NETTLE_ECC_H_INCLUDED
 
-#include <gmp.h>
-
 #include "nettle-types.h"
+#include "bignum.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gmp-glue.h b/gmp-glue.h
index f4144a925615740784e17e9f8ba9a65438fdb3d5..69663de695251e31004df83b69d33c3aa2ab172a 100644
--- a/gmp-glue.h
+++ b/gmp-glue.h
@@ -33,9 +33,7 @@
 #ifndef NETTLE_GMP_GLUE_H_INCLUDED
 #define NETTLE_GMP_GLUE_H_INCLUDED
 
-#include <gmp.h>
-
-#include "nettle-stdint.h"
+#include "bignum.h"
 
 #ifdef mpz_limbs_read
 #define GMP_HAVE_mpz_limbs_read 1
diff --git a/pkcs1.h b/pkcs1.h
index b766eb704be71c01616bba1dfe7f8d091bcd70b4..70aa21f17ce66bf147b1a0a8b26ce77fae5d25f3 100644
--- a/pkcs1.h
+++ b/pkcs1.h
@@ -34,8 +34,8 @@
 #ifndef NETTLE_PKCS1_H_INCLUDED
 #define NETTLE_PKCS1_H_INCLUDED
 
-#include <gmp.h>
 #include "nettle-types.h"
+#include "bignum.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/rsa.h b/rsa.h
index c039862732f3069b9018e4f7607b10954548f258..44d4af94920e0e2ed258739defb1f46227ff5c41 100644
--- a/rsa.h
+++ b/rsa.h
@@ -34,8 +34,8 @@
 #ifndef NETTLE_RSA_H_INCLUDED
 #define NETTLE_RSA_H_INCLUDED
 
-#include <gmp.h>
 #include "nettle-types.h"
+#include "bignum.h"
 
 #include "md5.h"
 #include "sha1.h"