diff --git a/include/bits.c b/include/bits.c
index f7aecf326..60d747369 100644
--- a/include/bits.c
+++ b/include/bits.c
@@ -92,15 +92,18 @@ int main(int argc, char **argv)
     fprintf(f, "#ifndef __BITS_H__\n");
     fprintf(f, "#define __BITS_H__\n");
     fprintf(f, "\n");
-    fprintf(f, "#ifdef HAVE_INTTYPES_H\n");
+#ifdef HAVE_SYS_TYPES_H
+    fprintf(f, "#include <sys/types.h>\n");
+#endif
+#ifdef HAVE_INTTYPES_H
     fprintf(f, "#include <inttypes.h>\n");
-    fprintf(f, "#endif\n");
-    fprintf(f, "#ifdef HAVE_SYS_BITYPES_H\n");
+#endif
+#ifdef HAVE_SYS_BITYPES_H
     fprintf(f, "#include <sys/bitypes.h>\n");
-    fprintf(f, "#endif\n");
-    fprintf(f, "#ifdef HAVE_NETINET_IN6_MACHTYPES_H\n");
+#endif
+#ifdef HAVE_NETINET_IN6_MACHTYPES_H
     fprintf(f, "#include <netinet/in6_machtypes.h>\n");
-    fprintf(f, "#endif\n");
+#endif
     fprintf(f, "\n");
     fprintf(f, "/* For compatibility with various type definitions */\n");
     fprintf(f, "#ifndef __BIT_TYPES_DEFINED__\n");