libelf_convert.c build error

[Paul Goyette <paul%whooppee.com@localhost>]

on amd64 with up-to-date sources, I am getting the following

libelf_convert.c: In function '_libelf_cvt_NOTE_tom':
libelf_convert.c:3086:9: error: unknown type name 'Elf_Note'; did you mean 'Elf_Byte'?
 3086 |         Elf_Note *en;
      |         ^~~~~~~~
      |         Elf_Byte
libelf_convert.c:3114:23: error: 'Elf_Note' undeclared (first use in this function); did you mean 'Elf_Byte'?
 3114 |                 en = (Elf_Note *) (uintptr_t) dst;
      |                       ^~~~~~~~
      |                       Elf_Byte
libelf_convert.c:3114:23: note: each undeclared identifier is reported only once for each function it appears in
libelf_convert.c:3114:33: error: expected expression before ')' token
 3114 |                 en = (Elf_Note *) (uintptr_t) dst;
      |                                 ^
libelf_convert.c:3114:46: error: expected ';' before 'dst'
 3114 |                 en = (Elf_Note *) (uintptr_t) dst;
      |                                              ^~~~
      |                                              ;
libelf_convert.c:3115:19: error: request for member 'n_namesz' in something not a structure or union
 3115 |                 en->n_namesz = namesz;
      |                   ^~
libelf_convert.c:3116:19: error: request for member 'n_descsz' in something not a structure or union
 3116 |                 en->n_descsz = descsz;
      |                   ^~
libelf_convert.c:3117:19: error: request for member 'n_type' in something not a structure or union
 3117 |                 en->n_type = type;
      |                   ^~
libelf_convert.c: In function '_libelf_cvt_NOTE_tof':
libelf_convert.c:3149:9: error: unknown type name 'Elf_Note'; did you mean 'Elf_Byte'?
 3149 |         Elf_Note *en;
      |         ^~~~~~~~
      |         Elf_Byte
libelf_convert.c:3160:31: error: 'Elf_Note' undeclared (first use in this function); did you mean 'Elf_Byte'?
 3160 |         while (count > sizeof(Elf_Note)) {
      |                               ^~~~~~~~
      |                               Elf_Byte
libelf_convert.c:3162:33: error: expected expression before ')' token
 3162 |                 en = (Elf_Note *) (uintptr_t) src;
      |                                 ^
libelf_convert.c:3162:46: error: expected ';' before 'src'
 3162 |                 en = (Elf_Note *) (uintptr_t) src;
      |                                              ^~~~
      |                                              ;
libelf_convert.c:3163:28: error: request for member 'n_namesz' in something not a structure or union
 3163 |                 namesz = en->n_namesz;
      |                            ^~
libelf_convert.c:3164:28: error: request for member 'n_descsz' in something not a structure or union
 3164 |                 descsz = en->n_descsz;
      |                            ^~
libelf_convert.c:3165:26: error: request for member 'n_type' in something not a structure or union
 3165 |                 type = en->n_type;
      |                          ^~
--- libelf_convert.lo ---

*** Failed target: libelf_convert.lo
*** In directory: /build/netbsd-local/src_ro/tools/elftoolchain/libelf
*** Failed commands:
	${_MKTARGET_COMPILE}
	=> @# "compile " libelf/libelf_convert.lo
	${HOST_COMPILE.c} -o ${.TARGET}.o ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
	=> cc -O    -I/build/netbsd-local/src_ro/tools/elftoolchain/libelf/../../compat -I/build/netbsd-local/src_ro/tools/elftoolchain/libelf/../../../external/bsd/elftoolchain/dist/libelf -I/build/netbsd-local/src_ro/tools/elftoolchain/libelf/../../../external/bsd/elftoolchain/dist/libelf/../common -I/build/netbsd-local/obj/amd64/tools/elftoolchain/libelf/../common -I/build/netbsd-local/tools/x86_64/amd64/include -DLIBELF_TEST_HOOKS -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64  -I/build/netbsd-local/tools/x86_64/amd64/include/compat -I/build/netbsd-local/src_ro/tools/compat  -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -c -o libelf_convert.lo.o    libelf_convert.c
	${MV} ${.TARGET}.o ${.TARGET}
	=> mv -f libelf_convert.lo.o libelf_convert.lo
*** [libelf_convert.lo] Error code 1

nbmake[3]: stopped making "realall" in /build/netbsd-local/src_ro/tools/elftoolchain/libelf
nbmake[3]: 1 error

nbmake[3]: stopped making "realall" in /build/netbsd-local/src_ro/tools/elftoolchain/libelf
--- dependall ---

nbmake[2]: stopped making "dependall" in /build/netbsd-local/src_ro/tools/elftoolchain/libelf
--- dependall-elftoolchain/libelf ---

nbmake[1]: stopped making "dependall-elftoolchain/libelf" in /build/netbsd-local/src_ro/tools
--- build_install ---

nbmake: stopped making "build_install" in /build/netbsd-local/src_ro/tools

+---------------------+--------------------------+----------------------+
| Paul Goyette (.sig) | PGP Key fingerprint:     | E-mail addresses:    |
| (Retired)           | 1B11 1849 721C 56C8 F63A | paul%whooppee.com@localhost    |
| Software Developer  | 6E2E 05FD 15CE 9F2D 5102 | pgoyette%netbsd.org@localhost  |
| & Network Engineer  |                          | pgoyette99%gmail.com@localhost |
+---------------------+--------------------------+----------------------+