diff --git a/generator/bindtests.ml b/generator/bindtests.ml
index ed0b24784..bd2600dfb 100644
--- a/generator/bindtests.ml
+++ b/generator/bindtests.ml
@@ -29,6 +29,8 @@ open Actions
 open Structs
 open C
 
+let generate_header = generate_header ~inputs:["generator/bindtests.ml"]
+
 let rec generate_bindtests () =
   generate_header CStyle LGPLv2plus;
 
diff --git a/generator/c.ml b/generator/c.ml
index c432356b2..417e2bc84 100644
--- a/generator/c.ml
+++ b/generator/c.ml
@@ -29,6 +29,8 @@ open Actions
 open Structs
 open Events
 
+let generate_header = generate_header ~inputs:["generator/c.ml"]
+
 (* Generate C API. *)
 
 (* The actions are split across this many C files.  You can increase
diff --git a/generator/csharp.ml b/generator/csharp.ml
index cb48ee3f1..0255e922b 100644
--- a/generator/csharp.ml
+++ b/generator/csharp.ml
@@ -28,6 +28,8 @@ open Optgroups
 open Actions
 open Structs
 
+let generate_header = generate_header ~inputs:["generator/csharp.ml"]
+
 let rec generate_csharp () =
   generate_header CPlusPlusStyle LGPLv2plus;
 
diff --git a/generator/customize.ml b/generator/customize.ml
index d272ffb27..36d185ced 100644
--- a/generator/customize.ml
+++ b/generator/customize.ml
@@ -23,6 +23,8 @@ open Printf
 open Docstrings
 open Pr
 
+let generate_header = generate_header ~inputs:["generator/customize.ml"]
+
 (* Command-line arguments used by virt-customize, virt-builder and
  * virt-sysprep.
  *)
diff --git a/generator/daemon.ml b/generator/daemon.ml
index d1689e1b6..cb8b6ba6a 100644
--- a/generator/daemon.ml
+++ b/generator/daemon.ml
@@ -29,6 +29,8 @@ open Actions
 open Structs
 open C
 
+let generate_header = generate_header ~inputs:["generator/daemon.ml"]
+
 (* Generate daemon/actions.h. *)
 let generate_daemon_actions_h () =
   generate_header CStyle GPLv2plus;
diff --git a/generator/erlang.ml b/generator/erlang.ml
index d5d30b475..4a18938b3 100644
--- a/generator/erlang.ml
+++ b/generator/erlang.ml
@@ -30,6 +30,8 @@ open Structs
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/erlang.ml"]
+
 let rec generate_erlang_erl () =
   generate_header ErlangStyle LGPLv2plus;
 
diff --git a/generator/errnostring.ml b/generator/errnostring.ml
index fa298160e..5033d2e05 100644
--- a/generator/errnostring.ml
+++ b/generator/errnostring.ml
@@ -25,6 +25,8 @@ open Utils
 open Pr
 open Docstrings
 
+let generate_header = generate_header ~inputs:["generator/errnostring.ml"]
+
 (* Generate the functions errno_to_string and string_to_errno which
  * convert errno (eg. EINVAL) into string ("EINVAL") and back again,
  * allowing us to portably pass error values over the protocol between
diff --git a/generator/fish.ml b/generator/fish.ml
index a562a7358..c5bf7e001 100644
--- a/generator/fish.ml
+++ b/generator/fish.ml
@@ -31,6 +31,8 @@ open Prepopts
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/fish.ml"]
+
 type func =
   | Function of string           (* The description. *)
   | Alias of string              (* The function of which it is one the
diff --git a/generator/gobject.ml b/generator/gobject.ml
index 8f23135ae..60c053ca2 100644
--- a/generator/gobject.ml
+++ b/generator/gobject.ml
@@ -30,6 +30,8 @@ open Structs
 open Types
 open Utils
 
+let generate_header = generate_header ~inputs:["generator/gobject.ml"]
+
 let camel_of_name { camel_name = camel_name } = "Guestfs" ^ camel_name
 
 let generate_gobject_proto name ?(single_line = true)
diff --git a/generator/golang.ml b/generator/golang.ml
index faaf19e7f..1cb97fcee 100644
--- a/generator/golang.ml
+++ b/generator/golang.ml
@@ -30,6 +30,8 @@ open Structs
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/golang.ml"]
+
 let generate_golang_go () =
   generate_header CStyle LGPLv2plus;
 
diff --git a/generator/haskell.ml b/generator/haskell.ml
index 1430edb57..66c921ef4 100644
--- a/generator/haskell.ml
+++ b/generator/haskell.ml
@@ -28,6 +28,8 @@ open Optgroups
 open Actions
 open Structs
 
+let generate_header = generate_header ~inputs:["generator/haskell.ml"]
+
 let rec generate_haskell_hs () =
   generate_header HaskellStyle LGPLv2plus;
 
diff --git a/generator/java.ml b/generator/java.ml
index 7bcd329b8..f3030483d 100644
--- a/generator/java.ml
+++ b/generator/java.ml
@@ -30,6 +30,8 @@ open Structs
 open Events
 open C
 
+let generate_header = generate_header ~inputs:["generator/java.ml"]
+
 (* Generate Java bindings GuestFS.java file. *)
 let rec generate_java_java () =
   generate_header CStyle LGPLv2plus;
diff --git a/generator/lua.ml b/generator/lua.ml
index eee751b5f..53c207272 100644
--- a/generator/lua.ml
+++ b/generator/lua.ml
@@ -30,6 +30,8 @@ open Structs
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/lua.ml"]
+
 let generate_lua_c () =
   generate_header CStyle LGPLv2plus;
 
diff --git a/generator/ocaml.ml b/generator/ocaml.ml
index 9071eb06c..288e91f0f 100644
--- a/generator/ocaml.ml
+++ b/generator/ocaml.ml
@@ -30,6 +30,8 @@ open Structs
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/ocaml.ml"]
+
 (* List of errnos to expose on Guestfs.Errno. *)
 let ocaml_errnos = [
   "EINVAL";
diff --git a/generator/perl.ml b/generator/perl.ml
index 6876b0f62..5250ce124 100644
--- a/generator/perl.ml
+++ b/generator/perl.ml
@@ -30,6 +30,8 @@ open Structs
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/perl.ml"]
+
 (* Generate Perl xs code, a sort of crazy variation of C with macros. *)
 let rec generate_perl_xs () =
   generate_header CStyle LGPLv2plus;
diff --git a/generator/php.ml b/generator/php.ml
index 15a618b61..926ac4fcd 100644
--- a/generator/php.ml
+++ b/generator/php.ml
@@ -29,6 +29,8 @@ open Actions
 open Structs
 open C
 
+let generate_header = generate_header ~inputs:["generator/php.ml"]
+
 let rec generate_php_h () =
   generate_header CStyle LGPLv2plus;
 
diff --git a/generator/python.ml b/generator/python.ml
index a7f5e3466..c618bf0b9 100644
--- a/generator/python.ml
+++ b/generator/python.ml
@@ -30,6 +30,8 @@ open Structs
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/python.ml"]
+
 (* Generate Python C module. *)
 let rec generate_python_c () =
   generate_header CStyle LGPLv2plus;
diff --git a/generator/ruby.ml b/generator/ruby.ml
index db222ea89..9567925b3 100644
--- a/generator/ruby.ml
+++ b/generator/ruby.ml
@@ -30,6 +30,8 @@ open Structs
 open C
 open Events
 
+let generate_header = generate_header ~inputs:["generator/ruby.ml"]
+
 (* Generate ruby bindings. *)
 let rec generate_ruby_c () =
   generate_header CStyle LGPLv2plus;
diff --git a/generator/tests_c_api.ml b/generator/tests_c_api.ml
index 7cf376387..635a4a66a 100644
--- a/generator/tests_c_api.ml
+++ b/generator/tests_c_api.ml
@@ -28,6 +28,8 @@ open Optgroups
 open Actions
 open Structs
 
+let generate_header = generate_header ~inputs:["generator/tests_c_api.ml"]
+
 (* Generate the C API tests. *)
 let rec generate_c_api_tests () =
   generate_header CStyle GPLv2plus;
diff --git a/generator/xdr.ml b/generator/xdr.ml
index 92d484bd5..60ccbf930 100644
--- a/generator/xdr.ml
+++ b/generator/xdr.ml
@@ -28,6 +28,8 @@ open Optgroups
 open Actions
 open Structs
 
+let generate_header = generate_header ~inputs:["generator/xdr.ml"]
+
 (* Generate the protocol (XDR) file, 'guestfs_protocol.x' and
  * indirectly 'guestfs_protocol.h' and 'guestfs_protocol.c'.
  *
diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc
index 866e1be21..46f27dc5b 100644
--- a/gobject/Makefile.inc
+++ b/gobject/Makefile.inc
@@ -1,6 +1,7 @@
 # libguestfs generated file
-# WARNING: THIS FILE IS GENERATED
-#          from the code in the generator/ subdirectory.
+# WARNING: THIS FILE IS GENERATED FROM THE FOLLOWING FILES:
+#          generator/gobject.ml
+#          and from the code in the generator/ subdirectory.
 # ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.
 #
 # Copyright (C) 2009-2016 Red Hat Inc.
diff --git a/java/Makefile.inc b/java/Makefile.inc
index 86da36aff..8f994eada 100644
--- a/java/Makefile.inc
+++ b/java/Makefile.inc
@@ -1,6 +1,7 @@
 # libguestfs generated file
-# WARNING: THIS FILE IS GENERATED
-#          from the code in the generator/ subdirectory.
+# WARNING: THIS FILE IS GENERATED FROM THE FOLLOWING FILES:
+#          generator/java.ml
+#          and from the code in the generator/ subdirectory.
 # ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.
 #
 # Copyright (C) 2009-2016 Red Hat Inc.