diff --git a/H/TermExt.h b/H/TermExt.h
index 30cd73f9c..e2169ddb1 100755
--- a/H/TermExt.h
+++ b/H/TermExt.h
@@ -25,7 +25,10 @@
 #define SF_STORE ((special_functors *)HEAP_INIT_BASE)
 #endif
 
-#if defined(USE_OFFSETS)
+
+#if 1
+extern Atom AtomFoundVar, AtomFreeTerm, AtomNil, AtomDot;
+#elif defined(USE_OFFSETS)
 #define AtomFoundVar ((Atom)(&(((special_functors *)(NULL))->AtFoundVar)))
 #define AtomFreeTerm ((Atom)(&(((special_functors *)(NULL))->AtFreeTerm)))
 #define AtomNil ((Atom)(&(((special_functors *)(NULL))->AtNil)))
diff --git a/H/YapTerm.h b/H/YapTerm.h
index a3767309d..e10cd6f50 100644
--- a/H/YapTerm.h
+++ b/H/YapTerm.h
@@ -72,7 +72,7 @@ typedef uint32_t UInt;
 #define Int_F "I32d"
 #define UInt_F "I32u"
 
-#elif SIZEOF_LONGINT == SIZEOF_INT_P
+#elif SIZEOF_LONG_INT == SIZEOF_INT_P
 
 typedef long int Int;
 typedef unsigned long int UInt;