diff --git a/progs/include/bpf_map_def.h b/progs/include/bpf_map_def.h
index 3aee332..03ca73b 100644
--- a/progs/include/bpf_map_def.h
+++ b/progs/include/bpf_map_def.h
@@ -22,23 +22,9 @@
 
 #include <linux/bpf.h>
 
-// These AID_* constants are permanent constants pulled from:
-//   system/core/libcutils/include/private/android_filesystem_config.h
-//
-// We need access to them from ebpf C code for map definitions
-// and thus don't want to pull in the entire header file.
-//
-// TODO(149434314) - switch to including some appropriate header portion
-#define AID_ROOT 0
-#define AID_SYSTEM 1000
-#define AID_NETWORK_STACK 1073
-#define AID_NET_BT_ADMIN 3001
-#define AID_NET_BT 3002
-#define AID_INET 3003
-#define AID_NET_RAW 3004
-#define AID_NET_ADMIN 3005
-#define AID_NET_BW_STATS 3006
-#define AID_NET_BW_ACCT 3007
+// Pull in AID_* constants from //system/core/libcutils/include/private/android_filesystem_config.h
+#define EXCLUDE_FS_CONFIG_STRUCTURES
+#include <private/android_filesystem_config.h>
 
 /*
  * Map structure to be used by Android eBPF C programs. The Android eBPF loader