--- src/cc/api/BPFTable.cc.orig
+++ src/cc/api/BPFTable.cc
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <linux/stddef.h>
 #include <fcntl.h>
 #include <linux/elf.h>
 #include <linux/perf_event.h>
--- src/cc/api/BPF.cc.orig
+++ src/cc/api/BPF.cc
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <linux/stddef.h>
 #include <linux/bpf.h>
 #include <linux/perf_event.h>
 #include <unistd.h>
--- src/cc/perf_reader.c.orig
+++ src/cc/perf_reader.c
@@ -14,6 +14,7 @@
  * limitations under the License.
  */

+#include <linux/stddef.h>
 #include <inttypes.h>
 #include <poll.h>
 #include <stdio.h>
--- src/cc/libbpf/src/libbpf.c.orig
+++ src/cc/libbpf/src/libbpf.c
@@ -12,6 +12,7 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
+#include <linux/stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
--- src/cc/libbpf.c.orig
+++ src/cc/libbpf.c
@@ -17,6 +17,7 @@
 #define _GNU_SOURCE
 #endif
 
+#include <linux/stddef.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
--- src/cc/libbpf/src/hashmap.h.orig	2019-05-29 19:27:27.000000000 +0200
+++ src/cc/libbpf/src/hashmap.h	2019-06-01 23:57:31.458324372 +0200
@@ -10,6 +10,9 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#if !defined(__GLIBC__)
+#include <bits/reg.h>	/* for __WORDSIZE */
+#endif
 #include "libbpf_internal.h"
 
 static inline size_t hash_bits(size_t h, int bits)