diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index a40a5ac5d6e..62bf7be680b 100644
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -141,11 +141,7 @@ typedef struct {
 /*
  *	Note entry header
  */
-typedef struct {
-	Elf32_Word	n_namesz;	/* length of note's name */
-	Elf32_Word	n_descsz;	/* length of note's "desc" */
-	Elf32_Word	n_type;		/* type of note */
-} Elf32_Nhdr;
+typedef Elf_Note Elf32_Nhdr;
 
 /*
  *	Move entry
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index 33b2d4b1bce..0fbb8ee7c39 100644
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -155,11 +155,7 @@ typedef struct {
 /*
  *	Note entry header
  */
-typedef struct {
-	Elf64_Word	n_namesz;	/* length of note's name */
-	Elf64_Word	n_descsz;	/* length of note's "desc" */
-	Elf64_Word	n_type;		/* type of note */
-} Elf64_Nhdr;
+typedef Elf_Note Elf64_Nhdr;
 
 /*
  *	Move entry