diff --git a/ChangeLog b/ChangeLog
index e276ef43ef9e6ea3e014cb0f482765ebba44b612..2774c670dcfad5a17f0ea5a457949eca5c867199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-10  Niels Möller  <nisse@lysator.liu.se>
+
+	Backported from master branch.
+	* aes-set-encrypt-key.c: Add missing include of stdlib.h.
+	* des-compat.c: Likewise.
+
 2018-08-09  Niels Möller  <nisse@lysator.liu.se>
 
 	Backported from master branch.
diff --git a/aes-set-encrypt-key.c b/aes-set-encrypt-key.c
index dfc2089b418a4a1b8b385aa4388b096a9cdfa30b..8de474dc859dd484184f32b45d1f7c72fc4b46ec 100644
--- a/aes-set-encrypt-key.c
+++ b/aes-set-encrypt-key.c
@@ -37,6 +37,7 @@
 #endif
 
 #include <assert.h>
+#include <stdlib.h>
 
 #include "aes-internal.h"
 
diff --git a/des-compat.c b/des-compat.c
index 689dfe09d7a34c63cd11c9c65c9d5ab92d535dab..76dfb9c7370ddbd405cc471796e990036aec1ce9 100644
--- a/des-compat.c
+++ b/des-compat.c
@@ -35,6 +35,7 @@
 # include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>