diff --git a/harbour/source/macro/Makefile b/harbour/source/macro/Makefile
index d339bd827f..618c7fcf51 100644
--- a/harbour/source/macro/Makefile
+++ b/harbour/source/macro/Makefile
@@ -9,9 +9,9 @@ YACC_FLAGS = -p hb_comp
 YACC_SOURCE=macro.y
 
 YACC_HEADERS=\
-	macro.h \
+	hbmacro.h \
 	hbsetup.h \
-	pcode.h \
+	hbpcode.h \
 	hbdefs.h \
 
 #NOTE: You can pass additional parameters that control the speed/size
@@ -31,7 +31,7 @@ LEX_HEADERS=\
 	hbsetup.h \
 	hberrors.h \
 	hbdefs.h \
-	macro.h \
+	hbmacro.h \
 
 C_SOURCES=macro.c \