diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c
index 37ad42bbe..51c17b41b 100644
--- a/lib/asn1/gen.c
+++ b/lib/asn1/gen.c
@@ -158,6 +158,9 @@ init_generate (const char *filename, const char *base)
 	     "#ifndef __%s_h__\n"
 	     "#define __%s_h__\n\n", headerbase, headerbase);
     fprintf (headerfile,
+             "#ifdef HAVE_CONFIG_H\n"
+             "#include <config.h>\n"
+             "#endif\n"
 	     "#include <stddef.h>\n"
 	     "#include <time.h>\n\n");
     fprintf (headerfile,
@@ -262,7 +265,10 @@ init_generate (const char *filename, const char *base)
     fprintf (templatefile,
 	     "/* Generated from %s */\n"
 	     "/* Do not edit */\n\n"
-	     "#include <stdio.h>\n"
+             "#ifdef HAVE_CONFIG_H\n"
+             "#include <config.h>\n"
+             "#endif\n"
+             "#include <stdio.h>\n"
 	     "#include <stdlib.h>\n"
              "#ifdef HAVE_STDINT_H\n"
 	     "#include <stdint.h>\n"
@@ -363,7 +369,10 @@ generate_header_of_codefile(const char *name)
     fprintf (codefile,
 	     "/* Generated from %s */\n"
 	     "/* Do not edit */\n\n"
-	     "#define  ASN1_LIB\n\n"
+             "#ifdef HAVE_CONFIG_H\n"
+             "#include <config.h>\n"
+             "#endif\n"
+             "#define  ASN1_LIB\n\n"
 	     "#include <stdio.h>\n"
 	     "#include <stdlib.h>\n"
              "#ifdef HAVE_STDINT_H\n"
diff --git a/lib/com_err/compile_et.c b/lib/com_err/compile_et.c
index c0700583e..41c1c75ae 100644
--- a/lib/com_err/compile_et.c
+++ b/lib/com_err/compile_et.c
@@ -79,6 +79,9 @@ generate_c(void)
     if(id_str)
 	fprintf(c_file, "/* %s */\n", id_str);
     fprintf(c_file, "\n");
+    fprintf(c_file, "#ifdef HAVE_CONFIG_H\n");
+    fprintf(c_file, "#include <config.h>\n");
+    fprintf(c_file, "#endif\n");
     fprintf(c_file, "#include <stddef.h>\n");
     fprintf(c_file, "#include <com_err.h>\n");
     fprintf(c_file, "#include \"%s\"\n", hfn);