diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c
index 10d2d20578..4f3bbbde72 100644
--- a/src/util/afs_lhash.c
+++ b/src/util/afs_lhash.c
@@ -12,16 +12,13 @@
 
 RCSID("$Header$");
 
-#ifdef KERNEL
-#include "afs_atomlist.h"
-#include "afs_lhash.h"
-#else /* KERNEL */
 #include "afs_atomlist.h"
 #include "afs_lhash.h"
+#ifndef KERNEL
 /* for now, only turn on assertions in user-space code */
 #include <assert.h>
 #define CHECK_INVARIANTS
-#endif /* KERNEL */
+#endif /* !KERNEL */
 
 /* max hash table load factor */
 enum { LOAD_FACTOR = 5 };
diff --git a/src/util/afs_lhash.h b/src/util/afs_lhash.h
index 911c29a8fd..e52547756c 100644
--- a/src/util/afs_lhash.h
+++ b/src/util/afs_lhash.h
@@ -28,7 +28,7 @@
 #ifndef AFS_LHASH_H
 #define AFS_LHASH_H
 
-#ifndef KERNEL
+#if !defined(KERNEL) || defined(UKERNEL)
 #include <stddef.h>
 #endif