diff --git a/OPTYap/opt.macros.h b/OPTYap/opt.macros.h
index cc2ef7099..ffbe36d1d 100644
--- a/OPTYap/opt.macros.h
+++ b/OPTYap/opt.macros.h
@@ -417,7 +417,7 @@ extern int Yap_page_size;
         }
 #endif /***********************************************************************************/
 
-#ifdef THREADS
+#if defined(THREADS) && defined(TABLING)
 #define ALLOC_STRUCT(STR, STR_TYPE, _PG_ENT)                          \
         GET_FREE_STRUCT(STR, STR_TYPE, LOCAL##_PG_ENT, GLOBAL##_PG_ENT)
 #define FREE_STRUCT(STR, STR_TYPE, _PG_ENT)                           \
diff --git a/OPTYap/opt.preds.c b/OPTYap/opt.preds.c
index b91b4bf26..e192fa679 100644
--- a/OPTYap/opt.preds.c
+++ b/OPTYap/opt.preds.c
@@ -159,7 +159,7 @@ struct page_statistics {
 #endif /* USE_PAGES_MALLOC */
 
 
-#ifdef THREADS
+#if defined(THREADS) && defined(TABLING)
 #define GET_ALL_PAGE_STATS(STATS, STR_TYPE, _PAGES)                    \
         LOCK(GLOBAL_ThreadHandlesLock);                                \
         CHECK_PAGE_FREE_STRUCTS(STR_TYPE, GLOBAL##_PAGES);             \