diff --git a/H/heap/dhstruct.h b/H/heap/dhstruct.h
index 79f0fe3ac..43bcf1450 100644
--- a/H/heap/dhstruct.h
+++ b/H/heap/dhstruct.h
@@ -120,12 +120,12 @@
 
 #define Yap_ExecutionMode Yap_heap_regs->Yap_ExecutionMode_
 
+#define PredsInHashTable Yap_heap_regs->PredsInHashTable_
+#define PredHashTableSize Yap_heap_regs->PredHashTableSize_
 #define PredHash Yap_heap_regs->PredHash_
 #if defined(YAPOR) || defined(THREADS)
 #define PredHashRWLock Yap_heap_regs->PredHashRWLock_
 #endif
-#define PredsInHashTable Yap_heap_regs->PredsInHashTable_
-#define PredHashTableSize Yap_heap_regs->PredHashTableSize_
 
 #define CreepCode Yap_heap_regs->CreepCode_
 #define UndefCode Yap_heap_regs->UndefCode_
diff --git a/H/heap/dlocals.h b/H/heap/dlocals.h
index 56e3e0da2..e5b3b6f04 100644
--- a/H/heap/dlocals.h
+++ b/H/heap/dlocals.h
@@ -25,14 +25,14 @@
 
 
 
+#define LOCAL_encoding LOCAL->encoding_
+#define REMOTE_encoding(wid) REMOTE(wid)->encoding_
 #define LOCAL_newline LOCAL->newline_
 #define REMOTE_newline(wid) REMOTE(wid)->newline_
 #define LOCAL_AtPrompt LOCAL->AtPrompt_
 #define REMOTE_AtPrompt(wid) REMOTE(wid)->AtPrompt_
 #define LOCAL_Prompt LOCAL->Prompt_
 #define REMOTE_Prompt(wid) REMOTE(wid)->Prompt_
-#define LOCAL_encoding LOCAL->encoding_
-#define REMOTE_encoding(wid) REMOTE(wid)->encoding_
 #define LOCAL_quasi_quotations LOCAL->quasi_quotations_
 #define REMOTE_quasi_quotations(wid) REMOTE(wid)->quasi_quotations_
 #define LOCAL_default_priority LOCAL->default_priority_
diff --git a/misc/HEAPFIELDS b/misc/HEAPFIELDS
index c28079154..05a0ad313 100644
--- a/misc/HEAPFIELDS
+++ b/misc/HEAPFIELDS
@@ -130,12 +130,12 @@ UInt	  	GLOBAL_flagCount	Yap_InitFlags(true)  RestoreFlags(GLOBAL_flagCount)
 yap_exec_mode	Yap_ExecutionMode	=INTERPRETED void
 
 /*  The Predicate Hash Table: fast access to predicates. */
+UInt		PredsInHashTable	=0 void
+uint64_t	PredHashTableSize	=0 void
 struct pred_entry **PredHash		InitPredHash() RestorePredHash()
 #if defined(YAPOR) || defined(THREADS)
 rwlock_t	PredHashRWLock		void
 #endif
-UInt		PredsInHashTable	=0 void
-uint64_t	PredHashTableSize	=0 void
 
 
 /* Well-Known Predicates */