diff --git a/ChangeLog b/ChangeLog
index 50c67aeae7ca74f190ed5d04d1338dd558c19221..d281ffdb310e3e56e1f6fffcddcd4b679c98d033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-06-17  Niels M�ller  <nisse@cuckoo.hack.org>
 
+	* Use <inttypes.h>, not <stdint.h>.
+
+	* blowfish.h (BLOWFISH_MAX_KEY_SIZE): Fixed, should be 56. 
+
 	* Fixed copyright notices.
 
 	* Makefile.am (libnettle_a_SOURCES): Added desinfo.h and
diff --git a/aes.h b/aes.h
index e7298d09f73117aa5e30b9ca2e9bfc03f069c2eb..398ac7e6d88ffc7ea36a2822e076329069a6cfe7 100644
--- a/aes.h
+++ b/aes.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_AES_H_INCLUDED
 #define NETTLE_AES_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define AES_BLOCK_SIZE 16
 
diff --git a/arcfour.h b/arcfour.h
index 4921961019276e45e17bbd4a1893d0a1817d7a6d..54aee4790d4dbe181b361f418b0c8f3db3429cf3 100644
--- a/arcfour.h
+++ b/arcfour.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_ARCFOUR_H_INCLUDED
 #define NETTLE_ARCFOUR_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 /* Minimum and maximum keysizes, and a reasonable default. In
  * octets.*/
diff --git a/blowfish.h b/blowfish.h
index eb346a773acacc5094b92b2bfe0419ee11d38b7b..72934da5a54756c0a9c7bd99247e99412207c1a3 100644
--- a/blowfish.h
+++ b/blowfish.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_BLOWFISH_H_INCLUDED
 #define NETTLE_BLOWFISH_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define BLOWFISH_BLOCK_SIZE 8
 
diff --git a/cast128.h b/cast128.h
index 9475aea1188546233fdce0c8f598ed69fc539f12..0d1e044e41f48de071a374fe1f4d90073d80ae67 100644
--- a/cast128.h
+++ b/cast128.h
@@ -32,7 +32,7 @@
 #ifndef NETTLE_CAST128_H_INCLUDED
 #define NETTLE_CAST128_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define CAST128_BLOCK_SIZE 8
 
diff --git a/des.h b/des.h
index 9f7584d035013a35454ca4142db7593a3b2e59cc..9c09a5dd642afd5be85c1fd34c7f9ffcce1374ec 100644
--- a/des.h
+++ b/des.h
@@ -35,7 +35,7 @@
 #ifndef NETTLE_DES_H
 #define NETTLE_DES_H
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define DES_KEY_SIZE 8
 #define DES_BLOCK_SIZE 8
diff --git a/md5.h b/md5.h
index c2d7e98cf06bd4dd0f9c19d7e55cec3812e1c3dc..b376f7db0d9483e1d8e6f35546000c91c7394d30 100644
--- a/md5.h
+++ b/md5.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_MD5_H_INCLUDED
 #define NETTLE_MD5_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define MD5_DIGEST_SIZE 16
 #define MD5_DATA_SIZE 64
diff --git a/memxor.h b/memxor.h
index 16c2829bd12dd67b6d7a14e3dd908f11935d4ca0..25621b1954c1ab535afea925a36c9290495b45e6 100644
--- a/memxor.h
+++ b/memxor.h
@@ -5,7 +5,7 @@
 #ifndef NETTLE_MEMXOR_H_INCLUDED
 #define NETTLE_MEMXOR_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 #include <stdlib.h>
 
 uint8_t *memxor(uint8_t *dst, const uint8_t *src, size_t n);
diff --git a/serpent.h b/serpent.h
index 7a404626186151d6a7f19b00a87d233ac44862a7..ae8afeb7c3040ec3da42eafd5b6b1e672e4b49b0 100644
--- a/serpent.h
+++ b/serpent.h
@@ -31,7 +31,7 @@
 #ifndef NETTLE_SERPENT_H_INCLUDED
 #define NETTLE_SERPENT_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define SERPENT_BLOCK_SIZE 16
 
diff --git a/sha1.h b/sha1.h
index 65113563a798d50c95a767c55f42af57b19e7f6f..ab1a88b3b19874933244004b3c5af35d86d3bc6a 100644
--- a/sha1.h
+++ b/sha1.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_SHA1_H_INCLUDED
 #define NETTLE_SHA1_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define SHA1_DIGEST_SIZE 20
 #define SHA1_DATA_SIZE 64
diff --git a/twofish.h b/twofish.h
index 217b9e303bf7a9836057a5d2b487a0bab6e77cdd..a33554c589c599492fbd5087bbbbc359ed6726ee 100644
--- a/twofish.h
+++ b/twofish.h
@@ -32,7 +32,7 @@
 #ifndef NETTLE_TWOFISH_H_INCLUDED
 #define NETTLE_TWOFISH_H_INCLUDED
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define TWOFISH_BLOCK_SIZE 16