Index: sys/amd64/amd64/efirt.c
===================================================================
--- sys/amd64/amd64/efirt.c
+++ sys/amd64/amd64/efirt.c
@@ -60,6 +60,29 @@
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 
+struct efi_rt {
+	struct efi_tblhdr rt_hdr;
+	efi_status	(*rt_gettime)(struct efi_tm *, struct efi_tmcap *)
+	    EFIABI_ATTR;
+	efi_status	(*rt_settime)(struct efi_tm *) EFIABI_ATTR;
+	efi_status	(*rt_getwaketime)(uint8_t *, uint8_t *,
+	    struct efi_tm *) EFIABI_ATTR;
+	efi_status	(*rt_setwaketime)(uint8_t, struct efi_tm *)
+	    EFIABI_ATTR;
+	efi_status	(*rt_setvirtual)(u_long, u_long, uint32_t,
+	    struct efi_md *) EFIABI_ATTR;
+	efi_status	(*rt_cvtptr)(u_long, void **) EFIABI_ATTR;
+	efi_status	(*rt_getvar)(efi_char *, struct uuid *, uint32_t *,
+	    u_long *, void *) EFIABI_ATTR;
+	efi_status	(*rt_scanvar)(u_long *, efi_char *, struct uuid *)
+	    EFIABI_ATTR;
+	efi_status	(*rt_setvar)(efi_char *, struct uuid *, uint32_t,
+	    u_long, void *) EFIABI_ATTR;
+	efi_status	(*rt_gethicnt)(uint32_t *) EFIABI_ATTR;
+	efi_status	(*rt_reset)(enum efi_reset, efi_status, u_long,
+	    efi_char *) EFIABI_ATTR;
+};
+
 static struct efi_systbl *efi_systbl;
 static struct efi_cfgtbl *efi_cfgtbl;
 static struct efi_rt *efi_runtime;
Index: sys/sys/efi.h
===================================================================
--- sys/sys/efi.h
+++ sys/sys/efi.h
@@ -122,29 +122,6 @@
 	uint32_t	__res;
 };
 
-struct efi_rt {
-	struct efi_tblhdr rt_hdr;
-	efi_status	(*rt_gettime)(struct efi_tm *, struct efi_tmcap *)
-	    EFIABI_ATTR;
-	efi_status	(*rt_settime)(struct efi_tm *) EFIABI_ATTR;
-	efi_status	(*rt_getwaketime)(uint8_t *, uint8_t *,
-	    struct efi_tm *) EFIABI_ATTR;
-	efi_status	(*rt_setwaketime)(uint8_t, struct efi_tm *)
-	    EFIABI_ATTR;
-	efi_status	(*rt_setvirtual)(u_long, u_long, uint32_t,
-	    struct efi_md *) EFIABI_ATTR;
-	efi_status	(*rt_cvtptr)(u_long, void **) EFIABI_ATTR;
-	efi_status	(*rt_getvar)(efi_char *, struct uuid *, uint32_t *,
-	    u_long *, void *) EFIABI_ATTR;
-	efi_status	(*rt_scanvar)(u_long *, efi_char *, struct uuid *)
-	    EFIABI_ATTR;
-	efi_status	(*rt_setvar)(efi_char *, struct uuid *, uint32_t,
-	    u_long, void *) EFIABI_ATTR;
-	efi_status	(*rt_gethicnt)(uint32_t *) EFIABI_ATTR;
-	efi_status	(*rt_reset)(enum efi_reset, efi_status, u_long,
-	    efi_char *) EFIABI_ATTR;
-};
-
 struct efi_systbl {
 	struct efi_tblhdr st_hdr;
 #define	EFI_SYSTBL_SIG	0x5453595320494249UL