diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 636cb4992ef..a0d08217be1 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* affinity.c: Include <string.h>, <stdio.h>.
+	(gomp_display_affinity_place): Remove cpusetp.
+	* teams.c: Include <limits.h>.
+
 2018-11-08  Jakub Jelinek  <jakub@redhat.com>
 
 	* testsuite/libgomp.c-c++-common/task-reduction-8.c (bar): Add
diff --git a/libgomp/affinity.c b/libgomp/affinity.c
index 99a45dcd3a0..efe5c4260e3 100644
--- a/libgomp/affinity.c
+++ b/libgomp/affinity.c
@@ -26,6 +26,8 @@
 /* This is a generic stub implementation of a CPU affinity setting.  */
 
 #include "libgomp.h"
+#include <string.h>
+#include <stdio.h>
 
 void
 gomp_init_affinity (void)
@@ -142,7 +144,6 @@ void
 gomp_display_affinity_place (char *buffer, size_t size, size_t *ret,
 			     int place)
 {
-  cpu_set_t *cpusetp;
   char buf[sizeof (long) * 3 + 4];
   if (gomp_available_cpus > 1)
     sprintf (buf, "0-%lu", gomp_available_cpus - 1);
diff --git a/libgomp/teams.c b/libgomp/teams.c
index 5aa0eae68d3..8ef80eb23f2 100644
--- a/libgomp/teams.c
+++ b/libgomp/teams.c
@@ -26,6 +26,7 @@
 /* This file handles the host TEAMS construct.  */
 
 #include "libgomp.h"
+#include <limits.h>
 
 static unsigned gomp_num_teams = 1, gomp_team_num = 0;