diff --git a/include/sys/avl_impl.h b/include/sys/avl_impl.h
index 85277b42b4..b2b4eb4bce 100644
--- a/include/sys/avl_impl.h
+++ b/include/sys/avl_impl.h
@@ -34,6 +34,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/sysmacros.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/sys/spa.h b/include/sys/spa.h
index 3073c4d1b9..f50cb5e04e 100644
--- a/include/sys/spa.h
+++ b/include/sys/spa.h
@@ -35,11 +35,10 @@
 #ifndef _SYS_SPA_H
 #define	_SYS_SPA_H
 
-#include <sys/avl.h>
 #include <sys/zfs_context.h>
+#include <sys/avl.h>
 #include <sys/kstat.h>
 #include <sys/nvpair.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/fs/zfs.h>
 #include <sys/spa_checksum.h>