diff --git a/H/dglobals.h b/H/dglobals.h
index 92b48e382..c2c290327 100644
--- a/H/dglobals.h
+++ b/H/dglobals.h
@@ -1,4 +1,8 @@
 
+  /* This file, dglobals.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/GLOBALS instead */
+
+
 
 
 
diff --git a/H/dhstruct.h b/H/dhstruct.h
index 96e952784..868599557 100644
--- a/H/dhstruct.h
+++ b/H/dhstruct.h
@@ -1,4 +1,8 @@
 
+  /* This file, dhstruct.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/HEAPFIELDS instead */
+
+
 
 
 
diff --git a/H/hglobals.h b/H/hglobals.h
index 7107aeeac..836705eb8 100644
--- a/H/hglobals.h
+++ b/H/hglobals.h
@@ -1,4 +1,8 @@
 
+  /* This file, hglobals.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/GLOBALS instead */
+
+
 
 
 
diff --git a/H/hstruct.h b/H/hstruct.h
index de0be1c1b..d1a1d579e 100644
--- a/H/hstruct.h
+++ b/H/hstruct.h
@@ -1,4 +1,8 @@
 
+  /* This file, hstruct.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/HEAPFIELDS instead */
+
+
 
 
 
diff --git a/H/iatoms.h b/H/iatoms.h
index 431c1aff8..cd71822b0 100644
--- a/H/iatoms.h
+++ b/H/iatoms.h
@@ -1,3 +1,7 @@
+
+  /* This file, iatoms.h, was generated automatically by "yap -L misc/buildatoms"
+     please do not update, update misc/ATOMS instead */
+
   Atom3Dots = Yap_LookupAtom("...");
   AtomAbol = Yap_FullLookupAtom("$abol");
   AtomAccess = Yap_LookupAtom("access");
diff --git a/H/iglobals.h b/H/iglobals.h
index d05eb3d65..9ac93ed64 100644
--- a/H/iglobals.h
+++ b/H/iglobals.h
@@ -1,4 +1,8 @@
 
+  /* This file, iglobals.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/GLOBALS instead */
+
+
 
 
 
diff --git a/H/ihstruct.h b/H/ihstruct.h
index abc78cf09..ad5aad982 100644
--- a/H/ihstruct.h
+++ b/H/ihstruct.h
@@ -1,4 +1,8 @@
 
+  /* This file, ihstruct.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/HEAPFIELDS instead */
+
+
 
 
 
diff --git a/H/ratoms.h b/H/ratoms.h
index 195310e81..5bbe1b87c 100644
--- a/H/ratoms.h
+++ b/H/ratoms.h
@@ -1,3 +1,7 @@
+
+  /* This file, ratoms.h, was generated automatically by "yap -L misc/buildatoms"
+     please do not update, update misc/ATOMS instead */
+
   Atom3Dots = AtomAdjust(Atom3Dots);
   AtomAbol = AtomAdjust(AtomAbol);
   AtomAccess = AtomAdjust(AtomAccess);
diff --git a/H/rglobals.h b/H/rglobals.h
index d5db0b367..8f4cd3b82 100644
--- a/H/rglobals.h
+++ b/H/rglobals.h
@@ -1,4 +1,8 @@
 
+  /* This file, rglobals.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/GLOBALS instead */
+
+
 
 
 
diff --git a/H/rhstruct.h b/H/rhstruct.h
index 29ea91c2a..77cf8d101 100644
--- a/H/rhstruct.h
+++ b/H/rhstruct.h
@@ -1,4 +1,8 @@
 
+  /* This file, rhstruct.h, was generated automatically by "yap -L misc/buildheap"
+     please do not update, update misc/HEAPFIELDS instead */
+
+
 
 
 
diff --git a/H/tatoms.h b/H/tatoms.h
index 02afbf4ac..0d53e7caf 100644
--- a/H/tatoms.h
+++ b/H/tatoms.h
@@ -1,3 +1,7 @@
+
+  /* This file, tatoms.h, was generated automatically by "yap -L misc/buildatoms"
+     please do not update, update misc/ATOMS instead */
+
   Atom Atom3Dots_;
 #define Atom3Dots Yap_heap_regs->Atom3Dots_
   Atom AtomAbol_;
diff --git a/misc/buildatoms b/misc/buildatoms
index f6d658b18..c35cfc620 100644
--- a/misc/buildatoms
+++ b/misc/buildatoms
@@ -1,6 +1,6 @@
 
 :- use_module(library(lineutils),
-	[file_filter/3,
+	[file_filter_with_init/5,
 	 split/3]).
 
 :- use_module(library(lists),
@@ -11,11 +11,13 @@
 :- yap_flag(write_strings,on).
 
 main :-
-	file_filter('misc/ATOMS','H/tatoms.h',gen_fields),
-	file_filter('misc/ATOMS','H/iatoms.h',gen_decl),
-	file_filter('misc/ATOMS','H/ratoms.h',gen_rcov).
-%	file_filter('misc/ATOMS','packages/PLStream/natoms.h',gen_swiatoms).
+	warning(Warning),
+	file_filter_with_init('misc/ATOMS','H/tatoms.h',gen_fields, Warning, ['tatoms.h']),
+	file_filter_with_init('misc/ATOMS','H/iatoms.h',gen_decl, Warning, ['iatoms.h']),
+	file_filter_with_init('misc/ATOMS','H/ratoms.h',gen_rcov, Warning, ['ratoms.h']).
+%	file_filter_with_init('misc/ATOMS','packages/PLStream/natoms.h', gen_swiatoms, Warning, ['natoms.h']).
 
+warning('~n  /* This file, ~a, was generated automatically by \"yap -L misc/buildatoms\"~n     please do not update, update misc/ATOMS instead */~n~n').
 
 gen_fields(Inp,Out) :-
 	split(Inp,"	",["A",Atom,_,_]), !,
diff --git a/misc/buildheap b/misc/buildheap
index 8855c9091..76a0b99de 100644
--- a/misc/buildheap
+++ b/misc/buildheap
@@ -1,6 +1,6 @@
 
 :- use_module(library(lineutils),
-	[file_filter/3,
+	[file_filter_with_init/5,
 	 split/3,
 	 glue/3]).
 
@@ -17,15 +17,18 @@
 :- style_check(all).
 
 main :-
-	file_filter('misc/HEAPFIELDS','H/hstruct.h',gen_struct),
-	file_filter('misc/HEAPFIELDS','H/dhstruct.h',gen_dstruct),
-	file_filter('misc/HEAPFIELDS','H/rhstruct.h',gen_hstruct),
-	file_filter('misc/HEAPFIELDS','H/ihstruct.h',gen_init),
-	file_filter('misc/GLOBALS','H/hglobals.h',gen_struct),
-	file_filter('misc/GLOBALS','H/dglobals.h',gen_dstruct),
-	file_filter('misc/GLOBALS','H/rglobals.h',gen_hstruct),
-	file_filter('misc/GLOBALS','H/iglobals.h',gen_init).
+	warning(Warning),
+	file_filter_with_init('misc/HEAPFIELDS','H/hstruct.h',gen_struct,Warning,['hstruct.h','HEAPFIELDS']),
+	file_filter_with_init('misc/HEAPFIELDS','H/dhstruct.h',gen_dstruct,Warning,['dhstruct.h','HEAPFIELDS']),
+	file_filter_with_init('misc/HEAPFIELDS','H/rhstruct.h',gen_hstruct,Warning,['rhstruct.h','HEAPFIELDS']),
+	file_filter_with_init('misc/HEAPFIELDS','H/ihstruct.h',gen_init,Warning,['ihstruct.h','HEAPFIELDS']),
+	file_filter_with_init('misc/GLOBALS','H/hglobals.h',gen_struct,Warning,['hglobals.h','GLOBALS']),
+	file_filter_with_init('misc/GLOBALS','H/dglobals.h',gen_dstruct,Warning,['dglobals.h','GLOBALS']),
+	file_filter_with_init('misc/GLOBALS','H/rglobals.h',gen_hstruct,Warning,['rglobals.h','GLOBALS']),
+	file_filter_with_init('misc/GLOBALS','H/iglobals.h',gen_init,Warning,['iglobals.h','GLOBALS']).
 	
+warning('~n  /* This file, ~a, was generated automatically by \"yap -L misc/buildheap\"~n     please do not update, update misc/~a instead */~n~n').
+
 
 
 /* define the field */