--- a/src/components/perf_event/perf_helpers.h
+++ b/src/components/perf_event/perf_helpers.h
@@ -40,14 +40,14 @@ sys_perf_event_open( struct perf_event_a
 typedef uint64_t u64;
 typedef int64_t s64;
 
-typedef __u32 u32;
-typedef __s32 s32;
+typedef uint32_t u32;
+typedef int32_t s32;
 
-typedef __u16 u16;
-typedef __s16 s16;
+typedef uint16_t u16;
+typedef int16_t s16;
 
-typedef __u8  u8;
-typedef __s8  s8;
+typedef uint8_t  u8;
+typedef int8_t  s8;
 
 
 #ifdef __SIZEOF_INT128__
--- a/src/components/perf_event/tests/perf_event_system_wide.c
+++ b/src/components/perf_event/tests/perf_event_system_wide.c
@@ -14,6 +14,7 @@
 #ifndef __USE_GNU
 #define __USE_GNU
 #endif
+#define _GNU_SOURCE
 
 /* For sched_setaffinity() */
 #include <sched.h>