diff --git a/src/intel/genxml/gen_pack_header.py b/src/intel/genxml/gen_pack_header.py
index fa9eae51718..e9ba0003f51 100644
--- a/src/intel/genxml/gen_pack_header.py
+++ b/src/intel/genxml/gen_pack_header.py
@@ -333,10 +333,7 @@ class Field(object):
 
         print("   %-36s %s%s;" % (type, self.name, dim))
 
-        prefix = ""
-        if self.values and self.default is None:
-            if self.prefix:
-                prefix = self.prefix + "_"
+        prefix = self.prefix + '_' if self.prefix else ''
 
         for value in self.values:
             print("#define %-40s %d" % (prefix + value.name, value.value))