diff --git a/include/ck_ht.h b/include/ck_ht.h
index 2237229..8d933ab 100644
--- a/include/ck_ht.h
+++ b/include/ck_ht.h
@@ -30,6 +30,7 @@
 #include <ck_pr.h>
 
 #if defined(CK_F_PR_LOAD_64) && defined(CK_F_PR_STORE_64)
+#define CK_F_HT
 
 #include <ck_cc.h>
 #include <ck_malloc.h>
diff --git a/regressions/ck_ht/benchmark/parallel.c b/regressions/ck_ht/benchmark/parallel.c
index 265bf88..0cb9d66 100644
--- a/regressions/ck_ht/benchmark/parallel.c
+++ b/regressions/ck_ht/benchmark/parallel.c
@@ -24,11 +24,12 @@
  * SUCH DAMAGE.
  */
 
-#if defined(CK_F_PR_LOAD_64) && defined(CK_F_PR_STORE_64)
+#include <ck_ht.h>
+
+#ifdef CK_F_HT
 
 #include <assert.h>
 #include <ck_epoch.h>
-#include <ck_ht.h>
 #include <ck_malloc.h>
 #include <ck_pr.h>
 #include <errno.h>
@@ -570,5 +571,5 @@ main(void)
 
 	return 0;
 }
-#endif /* CK_F_PR_LOAD_64 && CK_F_PR_STORE_64 */
+#endif /* CK_F_HT */
 
diff --git a/regressions/ck_ht/benchmark/serial.c b/regressions/ck_ht/benchmark/serial.c
index 9e4d1a1..e6de2da 100644
--- a/regressions/ck_ht/benchmark/serial.c
+++ b/regressions/ck_ht/benchmark/serial.c
@@ -24,9 +24,11 @@
  * SUCH DAMAGE.
  */
 
-#if defined(CK_F_PR_LOAD_64) && defined(CK_F_PR_STORE_64)
-#include <assert.h>
 #include <ck_ht.h>
+
+#ifdef CK_F_HT
+
+#include <assert.h>
 #include <ck_malloc.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -271,5 +273,5 @@ main(void)
 
 	return 0;
 }
-#endif /* CK_F_PR_LOAD_64 && CK_F_PR_STORE_64 */
+#endif /* CK_F_HT */
 
diff --git a/regressions/ck_ht/validate/serial.c b/regressions/ck_ht/validate/serial.c
index 29f893b..2cf6c86 100644
--- a/regressions/ck_ht/validate/serial.c
+++ b/regressions/ck_ht/validate/serial.c
@@ -24,9 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(CK_F_PR_LOAD_64) && defined(CK_F_PR_STORE_64)
-#include <assert.h>
 #include <ck_ht.h>
+
+#ifdef CK_F_HT
+#include <assert.h>
 #include <ck_malloc.h>
 #include <errno.h>
 #include <stdio.h>
@@ -288,5 +289,5 @@ main(void)
 
 	return 0;
 }
-#endif /* CK_F_PR_LOAD_64 && CK_F_PR_STORE_64 */
+#endif /* CK_F_HT */
 
diff --git a/src/ck_ht.c b/src/ck_ht.c
index e2b2f29..c022e49 100644
--- a/src/ck_ht.c
+++ b/src/ck_ht.c
@@ -24,9 +24,9 @@
  * SUCH DAMAGE.
  */
 
-#include <ck_pr.h>
+#include <ck_ht.h>
 
-#if defined(CK_F_PR_STORE_64) && defined(CK_F_PR_LOAD_64)
+#ifdef CK_F_HT
 /*
  * This implementation borrows several techniques from Josh Dybnis's
  * nbds library which can be found at http://code.google.com/p/nbds
@@ -35,8 +35,8 @@
  * We can address 32-bit platforms in a future release.
  */
 #include <ck_cc.h>
-#include <ck_ht.h>
 #include <ck_md.h>
+#include <ck_pr.h>
 #include <ck_stdint.h>
 #include <stdbool.h>
 #include <string.h>
@@ -717,4 +717,4 @@ ck_ht_destroy(struct ck_ht *table)
 	return;
 }
 
-#endif /* CK_F_PR_LOAD_64 && CK_F_PR_STORE_64 */
+#endif /* CK_F_HT */