diff --git a/multiboot2/src/end.rs b/multiboot2/src/end.rs
index d8f900c4..23707d0b 100644
--- a/multiboot2/src/end.rs
+++ b/multiboot2/src/end.rs
@@ -1,6 +1,6 @@
 //! Module for [`EndTag`].
 
-use crate::{TagHeader, TagType, TagTypeId};
+use crate::{TagHeader, TagType};
 use core::mem;
 use multiboot2_common::{MaybeDynSized, Tag};
 
@@ -8,15 +8,13 @@ use multiboot2_common::{MaybeDynSized, Tag};
 #[derive(Debug)]
 #[repr(C, align(8))]
 pub struct EndTag {
-    typ: TagTypeId,
-    size: u32,
+    header: TagHeader,
 }
 
 impl Default for EndTag {
     fn default() -> Self {
         Self {
-            typ: TagType::End.into(),
-            size: 8,
+            header: TagHeader::new(TagType::End, mem::size_of::<Self>() as u32),
         }
     }
 }