diff --git a/C/init.c b/C/init.c
index 790b86fb1..531e46b0e 100755
--- a/C/init.c
+++ b/C/init.c
@@ -1356,7 +1356,7 @@ Yap_InitWorkspace(UInt Heap, UInt Stack, UInt Trail, UInt Atts, UInt max_table_s
   Yap_InitMemory (Trail, Heap, Stack+Atts);
 #endif /* YAPOR && !THREADS */
 #if defined(YAPOR) || defined(TABLING)
-  Yap_init_global(max_table_size, n_workers, sch_loop, delay_load);
+  Yap_init_optyap_global(max_table_size, n_workers, sch_loop, delay_load);
 #endif /* YAPOR || TABLING */
   Yap_AttsSize = Atts;
 
diff --git a/OPTYap/opt.init.c b/OPTYap/opt.init.c
index 9773bf725..aedeba505 100644
--- a/OPTYap/opt.init.c
+++ b/OPTYap/opt.init.c
@@ -78,7 +78,7 @@ struct worker WORKER;
 **      Global functions      **
 *******************************/
 
-void Yap_init_global(int max_table_size, int n_workers, int sch_loop, int delay_load) {
+void Yap_init_optyap_global(int max_table_size, int n_workers, int sch_loop, int delay_load) {
   int i;
 
   /* global data related to memory management */
diff --git a/OPTYap/opt.proto.h b/OPTYap/opt.proto.h
index ebf12bbbf..8af6b12b4 100644
--- a/OPTYap/opt.proto.h
+++ b/OPTYap/opt.proto.h
@@ -33,7 +33,7 @@ void remap_memory(void);
 **      opt.init.c      **
 *************************/
 
-void Yap_init_global(int, int, int, int);
+void Yap_init_optyap_global(int, int, int, int);
 void Yap_init_local(void);
 void make_root_frames(void);
 #ifdef YAPOR
diff --git a/OPTYap/or.thread_engine.c b/OPTYap/or.thread_engine.c
index 39e5e11a3..71f333cb0 100644
--- a/OPTYap/or.thread_engine.c
+++ b/OPTYap/or.thread_engine.c
@@ -46,11 +46,6 @@
 static void share_private_nodes(int worker_q);
 
 
-
-/* ---------------------- **
-**      Local macros      **
-** ---------------------- */
-
 /* -------------------------- **
 **      Global functions      **
 ** -------------------------- */