diff --git a/lib/wind/gen-bidi.py b/lib/wind/gen-bidi.py
index a08f60c24..c1473d7df 100755
--- a/lib/wind/gen-bidi.py
+++ b/lib/wind/gen-bidi.py
@@ -53,8 +53,7 @@ bidi_c = generate.Implementation('%s/bidi_table.c' % sys.argv[2])
 
 bidi_h.file.write(
 '''
-#include <stdint.h>
-#include <stddef.h>
+#include <krb5-types.h>
 
 struct range_entry {
   uint32_t start;
diff --git a/lib/wind/gen-combining.py b/lib/wind/gen-combining.py
index 64891a738..987546568 100755
--- a/lib/wind/gen-combining.py
+++ b/lib/wind/gen-combining.py
@@ -59,8 +59,7 @@ combining_c = generate.Implementation('%s/combining_table.c' % sys.argv[2])
 
 combining_h.file.write(
 '''
-#include <stddef.h>
-#include <stdint.h>
+#include <krb5-types.h>
 
 struct translation {
   uint32_t key;
diff --git a/lib/wind/gen-normalize.py b/lib/wind/gen-normalize.py
index 7ea5f47ba..d771db30f 100755
--- a/lib/wind/gen-normalize.py
+++ b/lib/wind/gen-normalize.py
@@ -67,8 +67,7 @@ normalize_c = generate.Implementation('%s/normalize_table.c' % sys.argv[3])
 
 normalize_h.file.write(
 '''
-#include <stddef.h>
-#include <stdint.h>
+#include <krb5-types.h>
 
 #define MAX_LENGTH_CANON %u
 
diff --git a/lib/wind/gen-punycode-examples.py b/lib/wind/gen-punycode-examples.py
index 5ce19bbe2..f837234d4 100755
--- a/lib/wind/gen-punycode-examples.py
+++ b/lib/wind/gen-punycode-examples.py
@@ -86,8 +86,7 @@ f.close()
 
 examples_h.file.write(
 '''
-#include <stddef.h>
-#include <stdint.h>
+#include <krb5-types.h>
 
 #define MAX_LENGTH 40