From 1ee97ff9527b72de4e0670c32a2a659d17ca3a90 Mon Sep 17 00:00:00 2001
From: guimafelipe <guima.felipec@gmail.com>
Date: Tue, 14 Oct 2025 15:41:58 -0700
Subject: [PATCH 1/3] Fixing the headers for the common test header files

---
 test/inc/TestDef.h                              | 4 +++-
 test/inc/WindowsAppRuntime.Test.AppModel.h      | 4 ++--
 test/inc/WindowsAppRuntime.Test.Bootstrap.h     | 1 +
 test/inc/WindowsAppRuntime.Test.FileSystem.h    | 4 +++-
 test/inc/WindowsAppRuntime.Test.Package.h       | 1 +
 test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h | 6 +++++-
 test/inc/WindowsAppRuntime.Test.TAEF.h          | 6 +++++-
 7 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/test/inc/TestDef.h b/test/inc/TestDef.h
index 7ca711c876..c247bb4582 100644
--- a/test/inc/TestDef.h
+++ b/test/inc/TestDef.h
@@ -1,6 +1,8 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 #pragma once
+#include <string>
+#include <winrt/Windows.Foundation.h>
 
 constexpr static const int c_phaseTimeout = (30 * 1000); // 30 seconds
 static const std::wstring c_genericTestMoniker = L"this_is_a_test";
diff --git a/test/inc/WindowsAppRuntime.Test.AppModel.h b/test/inc/WindowsAppRuntime.Test.AppModel.h
index 5a025ed8a4..da628fe7e5 100644
--- a/test/inc/WindowsAppRuntime.Test.AppModel.h
+++ b/test/inc/WindowsAppRuntime.Test.AppModel.h
@@ -1,11 +1,11 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 #ifndef __WINDOWSAPPRUNTIME_TEST_APPMODEL_H
 #define __WINDOWSAPPRUNTIME_TEST_APPMODEL_H
 
+#include <windows.h>
 #include <appmodel.h>
-
 #include <Verify.h>
 
 namespace Test::AppModel
diff --git a/test/inc/WindowsAppRuntime.Test.Bootstrap.h b/test/inc/WindowsAppRuntime.Test.Bootstrap.h
index a831f77aa0..10fa5ee95a 100644
--- a/test/inc/WindowsAppRuntime.Test.Bootstrap.h
+++ b/test/inc/WindowsAppRuntime.Test.Bootstrap.h
@@ -4,6 +4,7 @@
 #ifndef __WINDOWSAPPRUNTIME_TEST_BOOTSTRAP_H
 #define __WINDOWSAPPRUNTIME_TEST_BOOTSTRAP_H
 
+#include <windows.h>
 #include <MddBootstrap.h>
 #include <MddBootstrapTest.h>
 
diff --git a/test/inc/WindowsAppRuntime.Test.FileSystem.h b/test/inc/WindowsAppRuntime.Test.FileSystem.h
index b8b5235942..7ab76a6b66 100644
--- a/test/inc/WindowsAppRuntime.Test.FileSystem.h
+++ b/test/inc/WindowsAppRuntime.Test.FileSystem.h
@@ -1,10 +1,12 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 #ifndef __WINDOWSAPPRUNTIME_TEST_FILESYSTEM_H
 #define __WINDOWSAPPRUNTIME_TEST_FILESYSTEM_H
 
 #include <filesystem>
+#include <windows.h>
+#include <Verify.h>
 
 #include <wil/win32_helpers.h>
 #include <wil/resource.h>
diff --git a/test/inc/WindowsAppRuntime.Test.Package.h b/test/inc/WindowsAppRuntime.Test.Package.h
index d8a6d319e0..4824fb4f56 100644
--- a/test/inc/WindowsAppRuntime.Test.Package.h
+++ b/test/inc/WindowsAppRuntime.Test.Package.h
@@ -4,6 +4,7 @@
 #ifndef __WINDOWSAPPRUNTIME_TEST_PACKAGE_H
 #define __WINDOWSAPPRUNTIME_TEST_PACKAGE_H
 
+#include <windows.h>
 #include <appmodel.h>
 
 #include <WindowsAppRuntime.Test.FileSystem.h>
diff --git a/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h b/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h
index 2662a1eb27..6f93a3158c 100644
--- a/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h
+++ b/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h
@@ -1,9 +1,13 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
+// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
 // Licensed under the MIT License.
 
 #ifndef __WINDOWSAPPRUNTIME_TEST_TAEF_CPPWINRT_H
 #define __WINDOWSAPPRUNTIME_TEST_TAEF_CPPWINRT_H
 
+#include <WexTestClass.h>
+#include <winrt/base.h>
+#include <windows.h>
+
 namespace WEX::TestExecution
 {
     // Teach TAEF how to format a winrt::hstring
diff --git a/test/inc/WindowsAppRuntime.Test.TAEF.h b/test/inc/WindowsAppRuntime.Test.TAEF.h
index 4934bffaa0..ffbb9925ef 100644
--- a/test/inc/WindowsAppRuntime.Test.TAEF.h
+++ b/test/inc/WindowsAppRuntime.Test.TAEF.h
@@ -1,9 +1,13 @@
-// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
+// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
 // Licensed under the MIT License.
 
 #ifndef __WINDOWSAPPRUNTIME_TEST_TAEF_H
 #define __WINDOWSAPPRUNTIME_TEST_TAEF_H
 
+#include <WexTestClass.h>
+#include <filesystem>
+#include <windows.h>
+
 namespace Test::TAEF
 {
     inline std::filesystem::path GetDeploymentDir()

From 26bc944563cc1d6effe6abba2cb49e2685c64115 Mon Sep 17 00:00:00 2001
From: guimafelipe <guima.felipec@gmail.com>
Date: Tue, 14 Oct 2025 15:42:49 -0700
Subject: [PATCH 2/3] Fixing this one

---
 test/inc/TestDef.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/inc/TestDef.h b/test/inc/TestDef.h
index c247bb4582..f496544e7f 100644
--- a/test/inc/TestDef.h
+++ b/test/inc/TestDef.h
@@ -2,7 +2,8 @@
 // Licensed under the MIT License.
 #pragma once
 #include <string>
-#include <winrt/Windows.Foundation.h>
+#include <winrt/base.h>
+#include <windows.h>
 
 constexpr static const int c_phaseTimeout = (30 * 1000); // 30 seconds
 static const std::wstring c_genericTestMoniker = L"this_is_a_test";

From dd2943eba71bb6d7443d045d7b0ae98a8f80272b Mon Sep 17 00:00:00 2001
From: guimafelipe <guima.felipec@gmail.com>
Date: Sat, 18 Oct 2025 19:23:33 -0700
Subject: [PATCH 3/3] Fixing include order

---
 test/inc/TestDef.h                              | 3 ++-
 test/inc/WindowsAppRuntime.Test.FileSystem.h    | 4 ++--
 test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h | 4 ++--
 test/inc/WindowsAppRuntime.Test.TAEF.h          | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/inc/TestDef.h b/test/inc/TestDef.h
index f496544e7f..aa97f75ff7 100644
--- a/test/inc/TestDef.h
+++ b/test/inc/TestDef.h
@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 #pragma once
+
+#include <windows.h>
 #include <string>
 #include <winrt/base.h>
-#include <windows.h>
 
 constexpr static const int c_phaseTimeout = (30 * 1000); // 30 seconds
 static const std::wstring c_genericTestMoniker = L"this_is_a_test";
diff --git a/test/inc/WindowsAppRuntime.Test.FileSystem.h b/test/inc/WindowsAppRuntime.Test.FileSystem.h
index 7ab76a6b66..f17b81c360 100644
--- a/test/inc/WindowsAppRuntime.Test.FileSystem.h
+++ b/test/inc/WindowsAppRuntime.Test.FileSystem.h
@@ -4,9 +4,9 @@
 #ifndef __WINDOWSAPPRUNTIME_TEST_FILESYSTEM_H
 #define __WINDOWSAPPRUNTIME_TEST_FILESYSTEM_H
 
-#include <filesystem>
 #include <windows.h>
-#include <Verify.h>
+#include <filesystem>
+#include <verify.h>
 
 #include <wil/win32_helpers.h>
 #include <wil/resource.h>
diff --git a/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h b/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h
index 6f93a3158c..83f8e3b4c0 100644
--- a/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h
+++ b/test/inc/WindowsAppRuntime.Test.TAEF.cppwinrt.h
@@ -4,9 +4,9 @@
 #ifndef __WINDOWSAPPRUNTIME_TEST_TAEF_CPPWINRT_H
 #define __WINDOWSAPPRUNTIME_TEST_TAEF_CPPWINRT_H
 
-#include <WexTestClass.h>
-#include <winrt/base.h>
 #include <windows.h>
+#include <winrt/base.h>
+#include <WexTestClass.h>
 
 namespace WEX::TestExecution
 {
diff --git a/test/inc/WindowsAppRuntime.Test.TAEF.h b/test/inc/WindowsAppRuntime.Test.TAEF.h
index ffbb9925ef..d10d646240 100644
--- a/test/inc/WindowsAppRuntime.Test.TAEF.h
+++ b/test/inc/WindowsAppRuntime.Test.TAEF.h
@@ -4,9 +4,9 @@
 #ifndef __WINDOWSAPPRUNTIME_TEST_TAEF_H
 #define __WINDOWSAPPRUNTIME_TEST_TAEF_H
 
-#include <WexTestClass.h>
-#include <filesystem>
 #include <windows.h>
+#include <filesystem>
+#include <WexTestClass.h>
 
 namespace Test::TAEF
 {