More header fixes

Signed-off-by: Dave Thaler <dthaler@microsoft.com>

.clang-format

@@ -53,6 +53,10 @@ IncludeCategories:
   - Regex: '^<ntifs.h'
     Priority: 2
     SortPriority: 4
+  # ndis.h must be before fwpsk.h
+  - Regex: '^<ndis.h'
+    Priority: 2
+    SortPriority: 4
   - Regex: '\.c"'
     Priority: 6
   - Regex: '^"'

ebpfapi/rpc_client.cpp

@@ -3,6 +3,7 @@
 
 #include "ebpf_api.h"
 #include "ebpf_platform.h"
+
 #include "rpc_interface_c.c"
 
 // Windows.h needs to be included before other headers.

netebpfext/user/netebpfext_platform.h

@@ -7,6 +7,7 @@
 
 #include <ws2def.h>
 #include <ws2ipdef.h>
+#include <ndis.h>
 #include <../km/fwpmk.h>
 #include <../km/fwpsk.h>
 #include <../km/netioddk.h>
@@ -15,6 +16,5 @@
 #include <fwpstypes.h>
 #include <fwpvi.h>
 #include <iphlpapi.h>
-#include <ndis.h>
 #include <netiodef.h>
 #include <winnt.h>

tests/api_test/api_test.cpp

@@ -15,14 +15,14 @@
 #include "socket_helper.h"
 
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <chrono>
 #include <io.h>
 #include <mstcpip.h>
 #include <mutex>
 #include <ntsecapi.h>
 #include <thread>
 #include <vector>
-#include <ws2tcpip.h>
 
 #define SAMPLE_PATH ""
 

tests/bpf2c_tests/expected/bpf_dll.c

@@ -6,12 +6,11 @@
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 // Windows Header Files
-#include <windows.h>
+#include "bpf2c.h"
 
+#include <windows.h>
 #include <stdio.h>
 
-#include "bpf2c.h"
-
 #define metadata_table bpf##_metadata_table
 extern metadata_table_t metadata_table;
 

tests/bpf2c_tests/expected/droppacket_unsafe_dll.c

@@ -6,12 +6,11 @@
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 // Windows Header Files
-#include <windows.h>
+#include "bpf2c.h"
 
+#include <windows.h>
 #include <stdio.h>
 
-#include "bpf2c.h"
-
 #define metadata_table droppacket_unsafe##_metadata_table
 extern metadata_table_t metadata_table;
 

tests/bpf2c_tests/expected/empty_dll.c

@@ -6,12 +6,11 @@
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 // Windows Header Files
-#include <windows.h>
+#include "bpf2c.h"
 
+#include <windows.h>
 #include <stdio.h>
 
-#include "bpf2c.h"
-
 #define metadata_table empty##_metadata_table
 extern metadata_table_t metadata_table;
 

tests/bpf2c_tests/expected/printk_unsafe_dll.c

@@ -6,12 +6,11 @@
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 // Windows Header Files
-#include <windows.h>
+#include "bpf2c.h"
 
+#include <windows.h>
 #include <stdio.h>
 
-#include "bpf2c.h"
-
 #define metadata_table printk_unsafe##_metadata_table
 extern metadata_table_t metadata_table;
 

tests/sample/ext/app/sample_ext_app.cpp

@@ -9,8 +9,8 @@
 #include "common_tests.h"
 #include "netsh_test_helper.h"
 #include "program_helper.h"
-#include "service_helper.h"
 #include "sample_ext_app.h"
+#include "service_helper.h"
 
 #include <chrono>
 #include <mutex>

tests/sample/ext/drv/sample_ext.c

@@ -13,10 +13,9 @@
 #include "ebpf_program_types.h"
 #include "ebpf_store_helper.h"
 #include "ebpf_structs.h"
-
-#include "sample_ext_program_info.h"
 #include "sample_ext_helpers.h"
 #include "sample_ext_ioctls.h"
+#include "sample_ext_program_info.h"
 
 #define SAMPLE_EBPF_EXTENSION_NPI_PROVIDER_VERSION 0
 

tests/sample/ext/drv/sample_ext_drv.c

@@ -8,7 +8,6 @@
  */
 
 #include "ebpf_platform.h"
-
 #include "sample_ext.h"
 #include "sample_ext_helpers.h"
 #include "sample_ext_ioctls.h"

tools/dnsflood/dns_flood.cpp

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: MIT
 
 #include <WinSock2.h>
+#include <ws2tcpip.h>
 #include <iostream>
 #include <thread>
 #include <vector>
-#include <ws2tcpip.h>
 #pragma comment(lib, "ws2_32.lib")
 
 struct _address_info

tools/export_program_info/export_program_info.cpp

@@ -5,14 +5,15 @@
 #define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
 
 #include "ebpf_api.h"
-#include "ebpf_general_helpers.c"
 #include "ebpf_nethooks.h"
 #include "ebpf_store_helper.h"
 #include "export_program_info.h"
 #include "windows_program_type.h"
 
 #include <codecvt>
 
+#include "ebpf_general_helpers.c"
+
 #define REG_CREATE_FLAGS (KEY_WRITE | DELETE | KEY_READ)
 #define REG_OPEN_FLAGS (DELETE | KEY_READ)