diff --git a/src/cpu/core_16/main.h b/src/cpu/core_16/main.h
index 2ccd460d..1bda6241 100644
--- a/src/cpu/core_16/main.h
+++ b/src/cpu/core_16/main.h
@@ -577,7 +577,7 @@ restart:
 		case 0x9b:												/* WAIT */
 			break; /* No waiting here */
 		case 0x9c:												/* PUSHF */
-			FILLFLAGS;
+			FillFlags();
 			Push_16(flags.word);
 			break;
 		case 0x9d:												/* POPF */
@@ -592,7 +592,7 @@ restart:
 			break;
 		case 0x9f:												/* LAHF */
 			{
-				FILLFLAGS;
+				FillFlags();
 				reg_ah=(Bit8u)flags.word;
 				break;
 			}
diff --git a/src/cpu/core_16/prefix_66.h b/src/cpu/core_16/prefix_66.h
index 6173b87e..47ee3d66 100644
--- a/src/cpu/core_16/prefix_66.h
+++ b/src/cpu/core_16/prefix_66.h
@@ -303,7 +303,7 @@ switch(Fetchb()) {
 		else reg_edx=0;
 		break;
 	case 0x9c:												/* PUSHFD */
-		FILLFLAGS;
+		FillFlags();
 		Push_32(flags.word);
 		break;
 	case 0x9d:												/* POPFD */
diff --git a/src/cpu/core_16/support.h b/src/cpu/core_16/support.h
index 02ed3a44..8770a7de 100644
--- a/src/cpu/core_16/support.h
+++ b/src/cpu/core_16/support.h
@@ -25,7 +25,7 @@
 
 #define LEAVECORE						\
 	SAVEIP;								\
-	FILLFLAGS;
+	FillFlags();
 
 static INLINE void ADDIP(Bit16u add) {
 	core_16.ip_lookup=SegBase(cs)+((Bit16u)(((Bit16u)(core_16.ip_lookup-SegBase(cs)))+(Bit16u)add));