Fix build by restoring header ordering dependencies and turning off sort

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

.clang-format

@@ -18,3 +18,6 @@ BinPackParameters: false
 #
 # Open brace goes on new line only when starting a new struct, enum, or func.
 BreakBeforeBraces: Mozilla
+#
+# Don't sort includes in alphabetical order because Windows headers are odd.
+SortIncludes: false

src/ebpf/dll/platform.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#include "api.h"
 #include "pch.h"
 #include <stdint.h>
+#include "api.h"
 
 namespace Platform {
 BOOL DeviceIoControl(

src/ebpf/libs/execution_context/ebpf_core.c

@@ -3,8 +3,8 @@
  *  SPDX-License-Identifier: MIT
  */
 
-#include "ebpf_protocol.h"
 #include "pch.h"
+#include "ebpf_protocol.h"
 
 #include "ebpf_core.h"
 #include "ebpf_maps.h"

src/ebpf/libs/execution_context/ebpf_maps.c

@@ -3,8 +3,8 @@
  *  SPDX-License-Identifier: MIT
  */
 
-#include "ebpf_protocol.h"
 #include "pch.h"
+#include "ebpf_protocol.h"
 
 #include "ebpf_core.h"
 #include "ebpf_maps.h"

src/ebpf/libs/execution_context/kernel/ebpf_platform.c

@@ -2,11 +2,11 @@
  *  Copyright (c) Microsoft Corporation
  *  SPDX-License-Identifier: MIT
  */
-#include "ebpf_platform.h"
-#include "ebpf_core.h"
-#include "ebpf_protocol.h"
 #include <ntddk.h>
 #include <ntintsafe.h>
+#include "ebpf_core.h"
+#include "ebpf_platform.h"
+#include "ebpf_protocol.h"
 
 typedef enum { ebpfPoolTag = 'fpbe' } EBPF_POOL_TAG;
 

src/ebpf/libs/execution_context/kernel/framework.h

@@ -1,8 +1,10 @@
+// Copyright (c) Microsoft Corporation
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <ntdef.h>
-#include <ntintsafe.h>
 #include <ntstatus.h>
+#include <ntintsafe.h>
 #define uint8_t UINT8
 #define uint16_t UINT16
 #define uint32_t UINT32

src/ebpf/libs/execution_context/user/ebpf_platform.cpp

@@ -2,9 +2,6 @@
  *  Copyright (c) Microsoft Corporation
  *  SPDX-License-Identifier: MIT
  */
-#include "ebpf_platform.h"
-#include "ebpf_core.h"
-#include "ebpf_protocol.h"
 #include <Windows.h>
 #include <map>
 #include <mutex>
@@ -12,6 +9,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <vector>
+#include "ebpf_core.h"
+#include "ebpf_platform.h"
+#include "ebpf_protocol.h"
 
 std::set<uint64_t> _executable_segments;
 

src/tools/netsh/dllmain.c

@@ -1,15 +1,15 @@
 // Copyright (C) Microsoft.
 // SPDX-License-Identifier: MIT
 #define WIN32_LEAN_AND_MEAN
-#include "api.h"
-#include "elf.h"
-#include "programs.h"
-#include "resource.h"
+#include <windows.h>
 #include <netsh.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <windows.h>
+#include "api.h"
+#include "elf.h"
+#include "programs.h"
+#include "resource.h"
 
 DWORD g_ApiDllInitialized = ERROR_SUCCESS;
 

src/tools/netsh/elf.cpp

@@ -1,17 +1,17 @@
 // Copyright (C) Microsoft.
 // SPDX-License-Identifier: MIT
 #define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
-#include "elf.h"
-#include "api.h"
-#include "tlv.h"
-#include "tokens.h"
 #include <codecvt>
 #include <iomanip>
 #include <iostream>
 #include <locale>
 #include <netsh.h>
-#include <windows.h>
+#include "elf.h"
+#include "api.h"
+#include "tlv.h"
+#include "tokens.h"
 
 TOKEN_VALUE g_LevelEnum[2] = {
     {L"normal", VL_NORMAL},

src/tools/netsh/programs.cpp

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: MIT
 #include <string>
 #define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <netsh.h>
 #include "ebpf_windows.h"
 #include "programs.h"
 #include "tokens.h"
-#include <netsh.h>
-#include <windows.h>
 
 #include "api.h"
 #include <iostream>