More #include untangling

lib/libvarnishapi/vsc.c

@@ -33,18 +33,20 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <stdio.h>
 #include <errno.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "miniobj.h"
+#include "vdef.h"
 #include "vas.h"
+#include "miniobj.h"
+#include "vqueue.h"
 
 #include "vapi/vsc.h"
 #include "vapi/vsm.h"
-#include "vqueue.h"
+
 #include "vsm_api.h"
 
 enum {

lib/libvarnishapi/vsl.c

@@ -41,15 +41,19 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "miniobj.h"
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
 
-#include "vapi/vsm.h"
-#include "vapi/vsl.h"
 #include "vbm.h"
 #include "vmb.h"
+#include "vqueue.h"
+#include "vre.h"
 #include "vsb.h"
+
+#include "vapi/vsm.h"
+#include "vapi/vsl.h"
+
 #include "vsl_api.h"
 #include "vsm_api.h"
 

lib/libvarnishapi/vsl2rst.c

@@ -29,8 +29,8 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

lib/libvarnishapi/vsl_api.h

@@ -29,11 +29,6 @@
  *
  */
 
-#include "vdef.h"
-#include "vqueue.h"
-#include "vre.h"
-#include "vapi/vsm.h"
-
 #define VSL_FILE_ID			"VSL"
 
 /*lint -esym(534, vsl_diag) */

lib/libvarnishapi/vsl_arg.c

@@ -36,21 +36,26 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <limits.h>
 
-#include "miniobj.h"
+#include "vdef.h"
 #include "vas.h"
+#include "miniobj.h"
 
-#include "vapi/vsl.h"
-#include "vapi/vsm.h"
 #include "vbm.h"
 #include "vnum.h"
+#include "vqueue.h"
+#include "vre.h"
+
+#include "vapi/vsl.h"
+#include "vapi/vsm.h"
+
 #include "vsl_api.h"
 #include "vsm_api.h"
 

lib/libvarnishapi/vsl_cursor.c

@@ -29,22 +29,29 @@
  *
  */
 
-#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <errno.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
+#include <unistd.h>
 
+#include "vdef.h"
 #include "vas.h"
 #include "miniobj.h"
-#include "vsm_api.h"
-#include "vapi/vsl.h"
+
+#include "vqueue.h"
+#include "vre.h"
 #include "vsl_priv.h"
+
+#include "vapi/vsl.h"
+#include "vapi/vsm.h"
+
 #include "vsl_api.h"
+#include "vsm_api.h"
 
 struct vslc_vsm {
 	unsigned			magic;

lib/libvarnishapi/vsl_dispatch.c

@@ -29,19 +29,23 @@
  */
 
 #include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <stdarg.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
+#include "vdef.h"
 #include "vas.h"
 #include "miniobj.h"
+
 #include "vqueue.h"
-#include "vtree.h"
+#include "vre.h"
 #include "vtim.h"
+#include "vtree.h"
 
 #include "vapi/vsl.h"
+
 #include "vsl_api.h"
 
 #define VTX_CACHE 10

lib/libvarnishapi/vsl_glob_test.c

@@ -28,8 +28,8 @@
  * Test what VSL_Name2Tag and VSL_Glob2Tags produces
  */
 
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

lib/libvarnishapi/vsl_query.c

@@ -28,22 +28,26 @@
  *
  */
 
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
 #include <math.h>
 #include <stdint.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
-#include "miniobj.h"
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
+
 #include "vbm.h"
 #include "vnum.h"
+#include "vqueue.h"
+#include "vre.h"
 #include "vsb.h"
 
 #include "vapi/vsl.h"
+
 #include "vsl_api.h"
 #include "vxp.h"
 

lib/libvarnishapi/vsm.c

@@ -43,15 +43,17 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "miniobj.h"
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
 
-#include "vapi/vsm.h"
-#include "vsm_priv.h"
-#include "vtim.h"
 #include "vin.h"
 #include "vsb.h"
+#include "vsm_priv.h"
+#include "vtim.h"
+
+#include "vapi/vsm.h"
+
 #include "vsm_api.h"
 
 #ifndef MAP_HASSEMAPHORE

lib/libvarnishapi/vsm_api.h

@@ -28,8 +28,6 @@
  *
  */
 
-#include <vdef.h>
-
 struct vsc;
 struct vsb;
 

lib/libvarnishapi/vxp.c

@@ -31,14 +31,15 @@
 #include "config.h"
 
 #include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
 #include "miniobj.h"
+
 #include "vqueue.h"
 #include "vre.h"
 #include "vsb.h"

lib/libvarnishapi/vxp_lexer.c

@@ -31,16 +31,17 @@
 #include "config.h"
 
 #include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #include "vdef.h"
-#include "vsb.h"
 #include "vas.h"
 #include "vqueue.h"
+
 #include "vre.h"
+#include "vsb.h"
 
 #include "vxp.h"
 

lib/libvarnishapi/vxp_parse.c

@@ -33,20 +33,24 @@
 #include <ctype.h>
 #include <errno.h>
 #include <math.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 
-#include "miniobj.h"
-#include "vas.h"
 #include "vdef.h"
+#include "vas.h"
+#include "miniobj.h"
+
 #include "vbm.h"
 #include "vnum.h"
+#include "vqueue.h"
+#include "vre.h"
 #include "vsb.h"
+
 #include "vapi/vsl.h"
-#include "vsl_api.h"
 
+#include "vsl_api.h"
 #include "vxp.h"
 
 static void vxp_expr_or(struct vxp *vxp, struct vex **pvex);

lib/libvarnishapi/vxp_test.c

@@ -26,16 +26,18 @@
  * SUCH DAMAGE.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "vxp.h"
+#include "miniobj.h"
 #include "vas.h"
+
 #include "vsb.h"
-#include "miniobj.h"
+
+#include "vxp.h"
 
 static void
 usage(void)