diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index 17d179bc1154..3660a92d61e5 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$");
 
 #include <geom/geom.h>
 
-MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
-
 #include <geom/uzip/g_uzip.h>
 #include <geom/uzip/g_uzip_cloop.h>
 #include <geom/uzip/g_uzip_softc.h>
@@ -53,6 +51,8 @@ MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
 #include <geom/uzip/g_uzip_lzma.h>
 #include <geom/uzip/g_uzip_wrkthr.h>
 
+MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
+
 FEATURE(geom_uzip, "GEOM read-only compressed disks support");
 
 struct g_uzip_blk {
diff --git a/sys/geom/uzip/g_uzip.h b/sys/geom/uzip/g_uzip.h
index 7a16827e7ebe..6decc41bab00 100644
--- a/sys/geom/uzip/g_uzip.h
+++ b/sys/geom/uzip/g_uzip.h
@@ -27,9 +27,11 @@
  *
  * $FreeBSD$
  */
+#ifndef	__GEOM_G_UZIP_H__
+#define	__GEOM_G_UZIP_H__
 
-#if !defined(M_GEOM_UZIP)
 MALLOC_DECLARE(M_GEOM_UZIP);
-#endif
 
 #define DEFINE_RAW_METHOD(func, rval, args...) typedef rval (*func##_t)(args)
+
+#endif	/* __GEOM_G_UZIP_H__ */