On 27 Apr 2021, at 13:05, Costin Lupu > wrote: For replication I used gcc 10.3 on an Alpine system. In order to replicate the redefinition error for PAGE_SIZE one should install the 'fortify-headers' package which will change the chain of included headers by indirectly including /usr/include/limits.h where PAGE_SIZE and PATH_MAX are defined. Costin Lupu (5): tools/debugger: Fix PAGE_SIZE redefinition error tools/libfsimage: Fix PATH_MAX redefinition error tools/libs/foreignmemory: Fix PAGE_SIZE redefinition error tools/libs/gnttab: Fix PAGE_SIZE redefinition error tools/ocaml: Fix redefinition errors tools/debugger/kdd/kdd-xen.c | 4 ++++ tools/debugger/kdd/kdd.c | 4 ++++ tools/libfsimage/ext2fs/fsys_ext2fs.c | 2 ++ tools/libfsimage/reiserfs/fsys_reiserfs.c | 2 ++ tools/libs/foreignmemory/private.h | 6 ++++-- tools/libs/gnttab/linux.c | 6 ++++++ tools/ocaml/libs/xc/xenctrl_stubs.c | 8 ++++++++ tools/ocaml/libs/xentoollog/xentoollog_stubs.c | 4 ++++ tools/ocaml/libs/xl/xenlight_stubs.c | 4 ++++ 9 files changed, 38 insertions(+), 2 deletions(-) — 2.20.1 For the OCaml bindings, this avoids redefinitions as you say. Looks good to me. Acked-by: Christian Lindig >