diff --git a/sys/amd64/vmm/io/vhpet.h b/sys/amd64/vmm/io/vhpet.h
index 113683c09b3..f22d0c3b38a 100644
--- a/sys/amd64/vmm/io/vhpet.h
+++ b/sys/amd64/vmm/io/vhpet.h
@@ -35,6 +35,7 @@
 #define	VHPET_BASE	0xfed00000
 #define	VHPET_SIZE	1024
 
+#ifdef _KERNEL
 struct vm_snapshot_meta;
 
 struct vhpet *vhpet_init(struct vm *vm);
@@ -49,4 +50,6 @@ int	vhpet_snapshot(struct vhpet *vhpet, struct vm_snapshot_meta *meta);
 int	vhpet_restore_time(struct vhpet *vhpet);
 #endif
 
+#endif /* _KERNEL */
+
 #endif	/* _VHPET_H_ */
diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h
index 19dbffe3ec2..17d2c29b758 100644
--- a/sys/amd64/vmm/io/vioapic.h
+++ b/sys/amd64/vmm/io/vioapic.h
@@ -32,11 +32,12 @@
 #ifndef _VIOAPIC_H_
 #define	_VIOAPIC_H_
 
-struct vm_snapshot_meta;
-
 #define	VIOAPIC_BASE	0xFEC00000
 #define	VIOAPIC_SIZE	4096
 
+#ifdef _KERNEL
+struct vm_snapshot_meta;
+
 struct vioapic *vioapic_init(struct vm *vm);
 void	vioapic_cleanup(struct vioapic *vioapic);
 
@@ -56,4 +57,6 @@ int	vioapic_snapshot(struct vioapic *vioapic,
 			 struct vm_snapshot_meta *meta);
 #endif
 
-#endif
+#endif /* _KERNEL */
+
+#endif /* _VIOAPIC_H_ */