diff --git a/harbour/source/vm/estack.c b/harbour/source/vm/estack.c
index af0353ac9d..5699e8ee52 100644
--- a/harbour/source/vm/estack.c
+++ b/harbour/source/vm/estack.c
@@ -54,6 +54,10 @@
    #define HB_OS_WIN_32_USED
 #endif
 
+#ifdef HB_STACK_MACROS
+   #undef HB_STACK_MACROS
+#endif
+
 #include "hbapi.h"
 #include "hbdefs.h"
 #include "hbstack.h"