diff --git a/ChangeLog b/ChangeLog
index 92e94b0ce26713c49c0a45db39151e41abd94156..c8abb1034aacc3f9524e097789caf6baba37d098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-03  Niels M�ller  <nisse@lysator.liu.se>
 
+	* gcm-aes.c: Include config.h.
+	* tools/nettle-lfib-stream.c: Likewise.
+
 	* ripemd160-compress.c: Added missing include of config.h. Needed
 	for correct operation on big-endian systems.
 
diff --git a/gcm-aes.c b/gcm-aes.c
index 40e26d735aedf56153706b61c5ed65190b14ca74..ada5dfc9125aa097dc2240d01aa31b90abef47fb 100644
--- a/gcm-aes.c
+++ b/gcm-aes.c
@@ -23,6 +23,10 @@
  * MA 02111-1307, USA.
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "gcm.h"
 
 void