More include fixes

diff --git a/typegen/main.c b/typegen/main.c
index 8186f4f490bf3d697955d365156776c39b15e964..ed47820eb223c3967201dca7e2854aa21e41310c 100644 (file)
--- a/typegen/main.c
+++ b/typegen/main.c
@@ -548,11 +548,14 @@ int main(__attribute((unused)) int argc, __attribute((unused)) char **argv)
        fprintf(c_fp, "\tThis file was automatically generated by Dragonnet.\n");
        fprintf(c_fp, "\tDo NOT edit it manually. Instead, edit types.dnet and re-run DragonnetTypegen.\n");
        fprintf(c_fp, "*/\n\n");
-       fprintf(c_fp, "#include <stdlib.h>\n");
-       fprintf(c_fp, "#include <string.h>\n");
        fprintf(c_fp, "#include <dragonnet/recv.h>\n");
        fprintf(c_fp, "#include <dragonnet/send.h>\n");
+       fprintf(c_fp, "#include <endian.h/endian.h>\n");
+       fprintf(c_fp, "#include <stdlib.h>\n");
+       fprintf(c_fp, "#include <string.h>\n");
        fprintf(c_fp, "#include <zlib.h>\n\n");
+       fprintf(h_fp, "#define htobe8(x) (x)\n");
+       fprintf(h_fp, "#define be8toh(x) (x)\n\n");
        fprintf(c_fp, "#include \"dnet-types.h\"\n\n");
 
        FILE *h_fp = fopen("dnet-types.h", "w");
@@ -560,12 +563,9 @@ int main(__attribute((unused)) int argc, __attribute((unused)) char **argv)
        fprintf(h_fp, "\tThis file was automatically generated by Dragonnet.\n");
        fprintf(h_fp, "\tDo NOT edit it manually. Instead, edit types.dnet and re-run DragonnetTypegen.\n");
        fprintf(h_fp, "*/\n\n");
-       fprintf(h_fp, "#include <dragonnet/peer.h>\n\n");
-       fprintf(h_fp, "#include <dragontype/number.h>\n\n");
+       fprintf(h_fp, "#include <dragonnet/peer.h>\n");
+       fprintf(h_fp, "#include <dragontype/number.h>\n");
        fprintf(h_fp, "#include <stddef.h>\n");
-       fprintf(h_fp, "#include <stdbool.h>\n");
-       fprintf(h_fp, "#define htobe8(x) (x)\n");
-       fprintf(h_fp, "#define be8toh(x) (x)\n\n");
        fprintf(h_fp, "typedef char *string;\n\n");
        fprintf(h_fp, "typedef struct {\n\tu32 siz;\n\tu8 *data;\n} *Blob;\n\n");
        fprintf(h_fp, "typedef struct {\n");