diff --git a/src/arch/x86/insts/microop_args.hh b/src/arch/x86/insts/microop_args.hh
index a8a01b1299..fe893a7c4e 100644
--- a/src/arch/x86/insts/microop_args.hh
+++ b/src/arch/x86/insts/microop_args.hh
@@ -353,8 +353,8 @@ class InstOperands : public Base, public Operands...
         std::stringstream response;
         Base::printMnemonic(response, this->instMnem, this->mnemonic);
         int count = 0;
-        M5_FOR_EACH_IN_PACK(ccprintf(response, count++ ? ", " : ""),
-                            Operands::print(response));
+        GEM5_FOR_EACH_IN_PACK(ccprintf(response, count++ ? ", " : ""),
+                              Operands::print(response));
         return response.str();
     }
 };
diff --git a/src/sim/guest_abi/dispatch.hh b/src/sim/guest_abi/dispatch.hh
index 2caa208b89..32e07b4596 100644
--- a/src/sim/guest_abi/dispatch.hh
+++ b/src/sim/guest_abi/dispatch.hh
@@ -102,8 +102,8 @@ dumpArgsFrom(std::ostream &os, GEM5_VAR_USED ThreadContext *tc,
     int count = 0;
     // Extract all the arguments from the thread context and print them,
     // prefixed with either a ( or a , as appropriate.
-    M5_FOR_EACH_IN_PACK(os << (count++ ? ", " : "("),
-                        os << getArgument<ABI, Args>(tc, state));
+    GEM5_FOR_EACH_IN_PACK(os << (count++ ? ", " : "("),
+                          os << getArgument<ABI, Args>(tc, state));
     os << ")";
 }
 
diff --git a/src/sim/guest_abi/layout.hh b/src/sim/guest_abi/layout.hh
index 08840ec289..9c8f42f2da 100644
--- a/src/sim/guest_abi/layout.hh
+++ b/src/sim/guest_abi/layout.hh
@@ -112,7 +112,7 @@ static inline void
 prepareForArguments(GEM5_VAR_USED ThreadContext *tc,
         typename ABI::State &state)
 {
-    M5_FOR_EACH_IN_PACK(Preparer<ABI, Argument, Args>::prepare(tc, state));
+    GEM5_FOR_EACH_IN_PACK(Preparer<ABI, Argument, Args>::prepare(tc, state));
 }
 
 template <typename ABI, typename Ret, typename ...Args>