diff --git a/policy/support/misc_macros.spt b/policy/support/misc_macros.spt
index 4422b5eca..8c47effef 100644
--- a/policy/support/misc_macros.spt
+++ b/policy/support/misc_macros.spt
@@ -34,7 +34,7 @@ define(`__endline__',`
 #
 # print a warning message
 #
-define(`refpolicywarn',`errprint(__file__:__line__: Warning: `$1'__endline__) ifdef(`m4_werror',`define(`m4_fatal_error')')')
+define(`refpolicywarn',`errprint(__program__:__file__:__line__: Warning: `$1'__endline__) ifdef(`m4_werror',`define(`m4_fatal_error')')')
 
 ########################################
 #
@@ -42,7 +42,7 @@ define(`refpolicywarn',`errprint(__file__:__line__: Warning: `$1'__endline__) if
 #
 # print an error message.
 #
-define(`refpolicyerr',`errprint(__file__:__line__: Error: `$1'__endline__) define(`m4_fatal_error')')
+define(`refpolicyerr',`errprint(__program__:__file__:__line__: Error: `$1'__endline__) define(`m4_fatal_error')')
 
 ########################################
 #
diff --git a/support/fatal_error.m4 b/support/fatal_error.m4
index edf39ee70..f6af11555 100644
--- a/support/fatal_error.m4
+++ b/support/fatal_error.m4
@@ -1,4 +1,4 @@
 ifdef(`m4_fatal_error',`
-    ifdef(`m4_werror',`errprint(__file__: Notice: Treating warnings as errors.__endline__)')
+    ifdef(`m4_werror',`errprint(__program__:__file__: Notice: Treating warnings as errors.__endline__)')
     m4exit(`1')
 ')