diff --git a/generator/docstrings.ml b/generator/docstrings.ml
index 488526f16..9d3fd0ba0 100644
--- a/generator/docstrings.ml
+++ b/generator/docstrings.ml
@@ -67,8 +67,7 @@ type comment_style =
   | ErlangStyle | LuaStyle | PODStyle
 type license = GPLv2plus | LGPLv2plus
 
-let generate_header ?(extra_inputs = []) ?emacs_mode comment license =
-  let inputs = "generator/ *.ml" :: extra_inputs in
+let generate_header ?(inputs = []) ?emacs_mode comment license =
   let c = match comment with
     | CStyle ->         pr "/* "; " *"
     | CPlusPlusStyle -> pr "// "; "//"
@@ -84,8 +83,14 @@ let generate_header ?(extra_inputs = []) ?emacs_mode comment license =
   | Some mode -> pr " -*- %s -*-" mode
   );
   pr "\n";
-  pr "%s WARNING: THIS FILE IS GENERATED FROM:\n" c;
-  List.iter (pr "%s   %s\n" c) inputs;
+  if inputs <> [] then (
+    pr "%s WARNING: THIS FILE IS GENERATED FROM THE FOLLOWING FILES:\n" c;
+    List.iter (pr "%s          %s\n" c) inputs;
+    pr "%s          and from the code in the generator/ subdirectory.\n" c
+  ) else (
+    pr "%s WARNING: THIS FILE IS GENERATED\n" c;
+    pr "%s          from the code in the generator/ subdirectory.\n" c
+  );
   pr "%s ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.\n" c;
   pr "%s\n" c;
   pr "%s Copyright (C) %s Red Hat Inc.\n" c copyright_years;
diff --git a/generator/docstrings.mli b/generator/docstrings.mli
index 22cadebf5..204b38df0 100644
--- a/generator/docstrings.mli
+++ b/generator/docstrings.mli
@@ -31,4 +31,4 @@ val version_added : Types.action -> string option
 
 val copyright_years : string
 
-val generate_header : ?extra_inputs:string list -> ?emacs_mode:string -> comment_style -> license -> unit
+val generate_header : ?inputs:string list -> ?emacs_mode:string -> comment_style -> license -> unit
diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc
index 5ba0fc994..866e1be21 100644
--- a/gobject/Makefile.inc
+++ b/gobject/Makefile.inc
@@ -1,6 +1,6 @@
 # libguestfs generated file
-# WARNING: THIS FILE IS GENERATED FROM:
-#   generator/ *.ml
+# WARNING: THIS FILE IS GENERATED
+#          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 8c1744377..86da36aff 100644
--- a/java/Makefile.inc
+++ b/java/Makefile.inc
@@ -1,6 +1,6 @@
 # libguestfs generated file
-# WARNING: THIS FILE IS GENERATED FROM:
-#   generator/ *.ml
+# WARNING: THIS FILE IS GENERATED
+#          from the code in the generator/ subdirectory.
 # ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.
 #
 # Copyright (C) 2009-2016 Red Hat Inc.