diff --git a/src/cascadia/TerminalApp/AboutDialog.cpp b/src/cascadia/TerminalApp/AboutDialog.cpp index 40b415871fd..ef80fc6b82e 100644 --- a/src/cascadia/TerminalApp/AboutDialog.cpp +++ b/src/cascadia/TerminalApp/AboutDialog.cpp @@ -6,7 +6,6 @@ #include "AboutDialog.h" #include "AboutDialog.g.cpp" -#include #include #include "../../types/inc/utils.hpp" diff --git a/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp b/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp index 8269b57adf3..2b7b4d0d0ff 100644 --- a/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp +++ b/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp @@ -6,8 +6,6 @@ #include "Utils.h" #include "../../types/inc/utils.hpp" -#include - using namespace winrt; using namespace winrt::Windows::Foundation::Collections; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp index 1b7881dc271..c41eea5431c 100644 --- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp +++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp @@ -5,7 +5,6 @@ #include "AppCommandlineArgs.h" #include "../types/inc/utils.hpp" #include "TerminalSettingsModel/ModelSerializationHelpers.h" -#include using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace TerminalApp; diff --git a/src/cascadia/TerminalApp/AppLogic.cpp b/src/cascadia/TerminalApp/AppLogic.cpp index 53c3fde491f..b3fec503f59 100644 --- a/src/cascadia/TerminalApp/AppLogic.cpp +++ b/src/cascadia/TerminalApp/AppLogic.cpp @@ -6,7 +6,6 @@ #include "AppLogic.g.cpp" #include "SettingsLoadEventArgs.h" -#include #include #include diff --git a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp index 4bed996a64d..0e68c14839a 100644 --- a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp +++ b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp @@ -1,7 +1,6 @@ #include "pch.h" #include "ColorPickupFlyout.h" #include "ColorPickupFlyout.g.cpp" -#include namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp index 6caca240366..bd218b1aeeb 100644 --- a/src/cascadia/TerminalApp/CommandPalette.cpp +++ b/src/cascadia/TerminalApp/CommandPalette.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "CommandPalette.h" #include "CommandPaletteItems.h" -#include #include "CommandPalette.g.cpp" diff --git a/src/cascadia/TerminalApp/CommandPaletteItems.cpp b/src/cascadia/TerminalApp/CommandPaletteItems.cpp index e7e66a5164b..1bfac603547 100644 --- a/src/cascadia/TerminalApp/CommandPaletteItems.cpp +++ b/src/cascadia/TerminalApp/CommandPaletteItems.cpp @@ -4,8 +4,6 @@ #include "pch.h" #include "Tab.h" -#include - #include "CommandPaletteItems.h" using namespace winrt; diff --git a/src/cascadia/TerminalApp/FilteredCommand.cpp b/src/cascadia/TerminalApp/FilteredCommand.cpp index 7e71a4a8362..f0f0cd71580 100644 --- a/src/cascadia/TerminalApp/FilteredCommand.cpp +++ b/src/cascadia/TerminalApp/FilteredCommand.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "CommandPalette.h" -#include #include "fzf/fzf.h" #include "FilteredCommand.g.cpp" diff --git a/src/cascadia/TerminalApp/MarkdownPaneContent.cpp b/src/cascadia/TerminalApp/MarkdownPaneContent.cpp index 200fc4f4a9f..9c961a70876 100644 --- a/src/cascadia/TerminalApp/MarkdownPaneContent.cpp +++ b/src/cascadia/TerminalApp/MarkdownPaneContent.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "MarkdownPaneContent.h" -#include #include "MarkdownPaneContent.g.cpp" #include diff --git a/src/cascadia/TerminalApp/MinMaxCloseControl.cpp b/src/cascadia/TerminalApp/MinMaxCloseControl.cpp index f4db97176e6..27504299c96 100644 --- a/src/cascadia/TerminalApp/MinMaxCloseControl.cpp +++ b/src/cascadia/TerminalApp/MinMaxCloseControl.cpp @@ -5,7 +5,6 @@ #include "MinMaxCloseControl.h" #include "MinMaxCloseControl.g.cpp" -#include using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalApp/SettingsPaneContent.h b/src/cascadia/TerminalApp/SettingsPaneContent.h index 10bee3bce18..a119039cf17 100644 --- a/src/cascadia/TerminalApp/SettingsPaneContent.h +++ b/src/cascadia/TerminalApp/SettingsPaneContent.h @@ -3,7 +3,6 @@ #pragma once #include "winrt/TerminalApp.h" -#include #include "BasicPaneEvents.h" namespace winrt::TerminalApp::implementation diff --git a/src/cascadia/TerminalApp/SnippetsPaneContent.h b/src/cascadia/TerminalApp/SnippetsPaneContent.h index 9daf9276653..1e25fb0cd25 100644 --- a/src/cascadia/TerminalApp/SnippetsPaneContent.h +++ b/src/cascadia/TerminalApp/SnippetsPaneContent.h @@ -7,7 +7,6 @@ #include "BasicPaneEvents.h" #include "FilteredCommand.h" #include "CommandPaletteItems.h" -#include namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/SuggestionsControl.cpp b/src/cascadia/TerminalApp/SuggestionsControl.cpp index 18e1eef3c61..048fb1968e6 100644 --- a/src/cascadia/TerminalApp/SuggestionsControl.cpp +++ b/src/cascadia/TerminalApp/SuggestionsControl.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "SuggestionsControl.h" -#include #include "CommandPaletteItems.h" diff --git a/src/cascadia/TerminalApp/Tab.cpp b/src/cascadia/TerminalApp/Tab.cpp index 6c305c66d1c..3fd90523b9e 100644 --- a/src/cascadia/TerminalApp/Tab.cpp +++ b/src/cascadia/TerminalApp/Tab.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include "ColorPickupFlyout.h" #include "Tab.h" #include "SettingsPaneContent.h" diff --git a/src/cascadia/TerminalApp/TabManagement.cpp b/src/cascadia/TerminalApp/TabManagement.cpp index b7a3e29e5ae..9ffc475e972 100644 --- a/src/cascadia/TerminalApp/TabManagement.cpp +++ b/src/cascadia/TerminalApp/TabManagement.cpp @@ -15,8 +15,6 @@ #include "../../inc/til/string.h" #include -#include - #include "TabRowControl.h" #include "ColorHelper.h" #include "DebugTapConnection.h" diff --git a/src/cascadia/TerminalApp/TabRowControl.cpp b/src/cascadia/TerminalApp/TabRowControl.cpp index 373b51a9233..aa069944282 100644 --- a/src/cascadia/TerminalApp/TabRowControl.cpp +++ b/src/cascadia/TerminalApp/TabRowControl.cpp @@ -5,7 +5,6 @@ #include "TabRowControl.h" #include "TabRowControl.g.cpp" -#include using namespace winrt::Windows::ApplicationModel::DataTransfer; diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index ce8e8762e4e..63b600277ce 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -5,7 +5,6 @@ #include "pch.h" #include "TerminalPage.h" -#include #include #include diff --git a/src/cascadia/TerminalApp/TerminalWindow.cpp b/src/cascadia/TerminalApp/TerminalWindow.cpp index 0b329a8ee4b..40eb4d4fae2 100644 --- a/src/cascadia/TerminalApp/TerminalWindow.cpp +++ b/src/cascadia/TerminalApp/TerminalWindow.cpp @@ -6,7 +6,6 @@ #include "AppLogic.h" -#include #include #include "TerminalWindow.g.cpp" diff --git a/src/cascadia/TerminalApp/init.cpp b/src/cascadia/TerminalApp/init.cpp index 1f1159478d7..38ecf7f8718 100644 --- a/src/cascadia/TerminalApp/init.cpp +++ b/src/cascadia/TerminalApp/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // Note: Generate GUID using TlgGuid.exe tool diff --git a/src/cascadia/TerminalApp/pch.h b/src/cascadia/TerminalApp/pch.h index 85b7090a936..ee36db25e32 100644 --- a/src/cascadia/TerminalApp/pch.h +++ b/src/cascadia/TerminalApp/pch.h @@ -96,3 +96,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider); #include // must go after the CoreDispatcher type is defined #include + +#include diff --git a/src/cascadia/TerminalConnection/AzureConnection.cpp b/src/cascadia/TerminalConnection/AzureConnection.cpp index a0f4e0f926b..dbc6ec9905d 100644 --- a/src/cascadia/TerminalConnection/AzureConnection.cpp +++ b/src/cascadia/TerminalConnection/AzureConnection.cpp @@ -7,7 +7,6 @@ #include "AzureClientID.h" #include #include -#include #include #include "AzureConnection.g.cpp" diff --git a/src/cascadia/TerminalConnection/ConptyConnection.cpp b/src/cascadia/TerminalConnection/ConptyConnection.cpp index 6f15a8c1edf..72975ea2a80 100644 --- a/src/cascadia/TerminalConnection/ConptyConnection.cpp +++ b/src/cascadia/TerminalConnection/ConptyConnection.cpp @@ -8,7 +8,6 @@ #include #include "CTerminalHandoff.h" -#include "LibraryResources.h" #include "../../types/inc/utils.hpp" #include "ConptyConnection.g.cpp" diff --git a/src/cascadia/TerminalConnection/init.cpp b/src/cascadia/TerminalConnection/init.cpp index ffde5a38578..fe3d3c31479 100644 --- a/src/cascadia/TerminalConnection/init.cpp +++ b/src/cascadia/TerminalConnection/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // Note: Generate GUID using TlgGuid.exe tool diff --git a/src/cascadia/TerminalConnection/pch.h b/src/cascadia/TerminalConnection/pch.h index 3ad67840cfc..b9007561e54 100644 --- a/src/cascadia/TerminalConnection/pch.h +++ b/src/cascadia/TerminalConnection/pch.h @@ -40,3 +40,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalConnectionProvider); #include #include + +#include diff --git a/src/cascadia/TerminalControl/ControlCore.cpp b/src/cascadia/TerminalControl/ControlCore.cpp index 6a4147637d1..aceed06270a 100644 --- a/src/cascadia/TerminalControl/ControlCore.cpp +++ b/src/cascadia/TerminalControl/ControlCore.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/src/cascadia/TerminalControl/ControlInteractivity.cpp b/src/cascadia/TerminalControl/ControlInteractivity.cpp index d9bc37571be..12bc1d0cb94 100644 --- a/src/cascadia/TerminalControl/ControlInteractivity.cpp +++ b/src/cascadia/TerminalControl/ControlInteractivity.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "../../types/inc/GlyphWidth.hpp" #include "../../types/inc/Utils.hpp" #include "../../buffer/out/search.h" diff --git a/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp b/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp index 77780108c8a..b1f77083799 100644 --- a/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp +++ b/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include -#include #include "InteractivityAutomationPeer.h" #include "InteractivityAutomationPeer.g.cpp" diff --git a/src/cascadia/TerminalControl/SearchBoxControl.cpp b/src/cascadia/TerminalControl/SearchBoxControl.cpp index 6b2c064c0e5..b788180df0b 100644 --- a/src/cascadia/TerminalControl/SearchBoxControl.cpp +++ b/src/cascadia/TerminalControl/SearchBoxControl.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "SearchBoxControl.h" #include "SearchBoxControl.g.cpp" -#include using namespace winrt; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index ea8446f04ec..a30a414b9bc 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "TermControl.h" -#include #include #include "TermControlAutomationPeer.h" diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp index 90ad7b98769..68a4444c20d 100644 --- a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp +++ b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include -#include #include "TermControlAutomationPeer.h" #include "TermControl.h" #include "TermControlAutomationPeer.g.cpp" diff --git a/src/cascadia/TerminalControl/init.cpp b/src/cascadia/TerminalControl/init.cpp index 4bc6b53f94c..e37ceed6fea 100644 --- a/src/cascadia/TerminalControl/init.cpp +++ b/src/cascadia/TerminalControl/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // For g_hCTerminalCoreProvider diff --git a/src/cascadia/TerminalControl/pch.h b/src/cascadia/TerminalControl/pch.h index 0fc3aa21604..5baf84a3591 100644 --- a/src/cascadia/TerminalControl/pch.h +++ b/src/cascadia/TerminalControl/pch.h @@ -81,3 +81,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalControlProvider); #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/TerminalSettingsEditor/Actions.cpp b/src/cascadia/TerminalSettingsEditor/Actions.cpp index dafc7b51da2..ffb2082f847 100644 --- a/src/cascadia/TerminalSettingsEditor/Actions.cpp +++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "Actions.h" #include "Actions.g.cpp" -#include "LibraryResources.h" #include "../TerminalSettingsModel/AllShortcutActions.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp index 2c1860d1f70..d1ab6c4d204 100644 --- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp @@ -5,7 +5,6 @@ #include "ActionsViewModel.h" #include "ActionsViewModel.g.cpp" #include "KeyBindingViewModel.g.cpp" -#include "LibraryResources.h" #include "../TerminalSettingsModel/AllShortcutActions.h" using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp index bb2156c646b..3034c450fda 100644 --- a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp +++ b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp @@ -7,8 +7,6 @@ #include "AddProfilePageNavigationState.g.cpp" #include "EnumEntry.h" -#include - using namespace winrt::Windows::Foundation; using namespace winrt::Windows::System; using namespace winrt::Windows::UI::Core; diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.cpp b/src/cascadia/TerminalSettingsEditor/Appearances.cpp index 030239b0a35..0ee6216dbec 100644 --- a/src/cascadia/TerminalSettingsEditor/Appearances.cpp +++ b/src/cascadia/TerminalSettingsEditor/Appearances.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "Appearances.h" -#include #include "../WinRTUtils/inc/Utils.h" #include "EnumEntry.h" diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.h b/src/cascadia/TerminalSettingsEditor/Appearances.h index e8b1cac6c3c..e191311908c 100644 --- a/src/cascadia/TerminalSettingsEditor/Appearances.h +++ b/src/cascadia/TerminalSettingsEditor/Appearances.h @@ -23,7 +23,6 @@ Author(s): #include "Utils.h" #include "ViewModelHelpers.h" #include "SettingContainer.h" -#include namespace winrt::Microsoft::Terminal::Settings::Editor::implementation { diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp index fef533a8f50..d2f10c259e5 100644 --- a/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp @@ -5,7 +5,6 @@ #include "ColorSchemeViewModel.h" #include "ColorSchemeViewModel.g.cpp" -#include #include "..\WinRTUtils\inc\Utils.h" namespace winrt::Microsoft::Terminal::Settings::Editor::implementation diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp index be932d2b90f..42c59dcecd4 100644 --- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp +++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp @@ -6,8 +6,6 @@ #include "ColorTableEntry.g.cpp" #include "ColorSchemes.g.cpp" -#include - using namespace winrt; using namespace winrt::Windows::UI; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp index ce24a89e481..1c3953a97bf 100644 --- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp +++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp @@ -5,8 +5,6 @@ #include "EditColorScheme.h" #include "EditColorScheme.g.cpp" -#include - using namespace winrt; using namespace winrt::Windows::UI; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.cpp b/src/cascadia/TerminalSettingsEditor/Extensions.cpp index a3aec0ad7c9..bd50678c170 100644 --- a/src/cascadia/TerminalSettingsEditor/Extensions.cpp +++ b/src/cascadia/TerminalSettingsEditor/Extensions.cpp @@ -9,7 +9,6 @@ #include "FragmentProfileViewModel.g.cpp" #include "ExtensionPackageTemplateSelector.g.cpp" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp index acb0abcb348..d08c55b5625 100644 --- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp +++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp @@ -5,7 +5,6 @@ #include "GlobalAppearance.h" #include "GlobalAppearance.g.cpp" -#include #include using namespace winrt; diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp b/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp index b5e580666f1..7dbfdcc20ac 100644 --- a/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp @@ -6,8 +6,6 @@ #include "GlobalAppearanceViewModel.g.cpp" #include "EnumEntry.h" -#include - using namespace winrt; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Xaml::Navigation; diff --git a/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp b/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp index d09abf52575..f7a6ce609a3 100644 --- a/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp +++ b/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "KeyChordListener.h" #include "KeyChordListener.g.cpp" -#include "LibraryResources.h" using namespace winrt::Windows::UI::Core; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Launch.cpp b/src/cascadia/TerminalSettingsEditor/Launch.cpp index 286ed7c814b..6b29bb6b7f8 100644 --- a/src/cascadia/TerminalSettingsEditor/Launch.cpp +++ b/src/cascadia/TerminalSettingsEditor/Launch.cpp @@ -7,8 +7,6 @@ #include "EnumEntry.h" #include "LaunchViewModel.h" -#include - using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Xaml::Navigation; using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp b/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp index cf99cadb9a0..d7b8ca87684 100644 --- a/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp @@ -6,7 +6,6 @@ #include "LaunchViewModel.g.cpp" #include "EnumEntry.h" -#include #include using namespace winrt::Windows::UI::Xaml::Navigation; diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index 6f9c460797c..c024ed452b4 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -22,7 +22,6 @@ #include "..\types\inc\utils.hpp" #include <..\WinRTUtils\inc\Utils.h> -#include #include namespace winrt diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp index 25b7f8ef77d..602610e0d35 100644 --- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp +++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp @@ -9,8 +9,6 @@ #include "NewTabMenuViewModel.h" -#include - using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Xaml::Navigation; using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp index f04c24346e4..6dcf0281d85 100644 --- a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "NewTabMenuViewModel.h" -#include #include "NewTabMenuViewModel.g.cpp" #include "FolderTreeViewEntry.g.cpp" diff --git a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp index 4cb9f655b72..3ad0a674b87 100644 --- a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp +++ b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp @@ -5,8 +5,6 @@ #include "NullableColorPicker.h" #include "NullableColorPicker.g.cpp" -#include - using namespace winrt; using namespace winrt::Windows::UI; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp b/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp index aabfb6579c1..cc1508cf350 100644 --- a/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp +++ b/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "PreviewConnection.h" -#include using namespace ::winrt::Microsoft::Terminal::TerminalConnection; using namespace ::winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp index feb4765f7e0..773b7a5aab8 100644 --- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp @@ -7,7 +7,6 @@ #include "EnumEntry.h" #include "Appearances.h" -#include #include "../WinRTUtils/inc/Utils.h" #include "../../renderer/base/FontCache.h" #include "SegoeFluentIconList.h" diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp index 29b9f89108d..99261ccd8c1 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp @@ -7,7 +7,6 @@ #include "ProfileViewModel.h" #include "EnumEntry.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp index 476c81e3118..d0b737b841b 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp @@ -6,7 +6,6 @@ #include "Profiles_Base.g.cpp" #include "ProfileViewModel.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp index bc27cc4c2da..68153b7d906 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp @@ -6,7 +6,6 @@ #include "Profiles_Base_Orphaned.g.cpp" #include "ProfileViewModel.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp index 7d42d64d217..68ee1897bf4 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp @@ -7,7 +7,6 @@ #include "ProfileViewModel.h" #include "EnumEntry.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::UI::Xaml::Navigation; diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp index 2ab16141237..4bac3ead42b 100644 --- a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp +++ b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "SettingContainer.h" #include "SettingContainer.g.cpp" -#include "LibraryResources.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Utils.cpp b/src/cascadia/TerminalSettingsEditor/Utils.cpp index 5fc2fea9995..6f3d0162f5f 100644 --- a/src/cascadia/TerminalSettingsEditor/Utils.cpp +++ b/src/cascadia/TerminalSettingsEditor/Utils.cpp @@ -6,8 +6,6 @@ #include "pch.h" #include "Utils.h" -#include - using namespace winrt; using namespace winrt::Windows::System; using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/pch.h b/src/cascadia/TerminalSettingsEditor/pch.h index d21e5321efb..3479aaf9b89 100644 --- a/src/cascadia/TerminalSettingsEditor/pch.h +++ b/src/cascadia/TerminalSettingsEditor/pch.h @@ -66,3 +66,5 @@ #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp index a9967193081..c0c0924b059 100644 --- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp @@ -7,7 +7,6 @@ #include "JsonUtils.h" #include "HashUtils.h" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp index ee014118602..f204e7dadbe 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp @@ -51,7 +51,6 @@ #include "SelectOutputArgs.g.cpp" #include "ColorSelectionArgs.g.cpp" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.h b/src/cascadia/TerminalSettingsModel/ActionArgs.h index d72db038df8..810ebd862ce 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.h +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.h @@ -59,7 +59,6 @@ #include "TerminalSettingsSerializationHelpers.h" -#include #include #include "ActionArgsMagic.h" diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.cpp b/src/cascadia/TerminalSettingsModel/ActionMap.cpp index 730e6463101..b67d860f943 100644 --- a/src/cascadia/TerminalSettingsModel/ActionMap.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionMap.cpp @@ -6,7 +6,6 @@ #include "ActionMap.h" #include "Command.h" #include "AllShortcutActions.h" -#include #include #include "ActionMap.g.cpp" diff --git a/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp b/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp index 3d42bdd21c5..f743f42feac 100644 --- a/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp @@ -8,7 +8,6 @@ #include "../../inc/DefaultSettings.h" #include "DynamicProfileUtils.h" -#include using namespace ::Microsoft::Terminal::Settings::Model; using namespace winrt::Microsoft::Terminal::Settings::Model; diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp index 1528b97a4ee..1701290558f 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp @@ -9,7 +9,6 @@ #include "DefaultTerminal.h" #include "FileUtils.h" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp index 16f71dd1304..8615a08f3f6 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "CascadiaSettings.h" -#include #include #include #include diff --git a/src/cascadia/TerminalSettingsModel/Command.cpp b/src/cascadia/TerminalSettingsModel/Command.cpp index a2395f42180..e05903c2bcc 100644 --- a/src/cascadia/TerminalSettingsModel/Command.cpp +++ b/src/cascadia/TerminalSettingsModel/Command.cpp @@ -5,7 +5,6 @@ #include "Command.h" #include "Command.g.cpp" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp b/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp index 6a6b903c6f8..1c4550091ea 100644 --- a/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp +++ b/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp @@ -5,8 +5,6 @@ #include "DefaultTerminal.h" #include "DefaultTerminal.g.cpp" -#include - using namespace winrt::Microsoft::Terminal::Settings; using namespace winrt::Microsoft::Terminal::Settings::Model::implementation; diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp index 55af1703558..1431b25dfc5 100644 --- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp @@ -9,8 +9,6 @@ #include "GlobalAppSettings.g.cpp" -#include - using namespace Microsoft::Terminal::Settings::Model; using namespace winrt::Microsoft::Terminal::Settings::Model::implementation; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp b/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp index 01e4c491bdf..e537e071820 100644 --- a/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp @@ -15,7 +15,6 @@ #include #include #include -#include static constexpr std::wstring_view POWERSHELL_PFN{ L"Microsoft.PowerShell_8wekyb3d8bbwe" }; static constexpr std::wstring_view POWERSHELL_PREVIEW_PFN{ L"Microsoft.PowerShellPreview_8wekyb3d8bbwe" }; diff --git a/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp b/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp index e3c7ebbcb36..d3b6a290d1d 100644 --- a/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp @@ -7,7 +7,6 @@ #include "../../inc/DefaultSettings.h" #include "DynamicProfileUtils.h" -#include static constexpr std::wstring_view SshHostGeneratorNamespace{ L"Windows.Terminal.SSH" }; diff --git a/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp b/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp index 69feb6174e1..38388526030 100644 --- a/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp @@ -6,7 +6,6 @@ #include "VisualStudioGenerator.h" #include "VsDevCmdGenerator.h" #include "VsDevShellGenerator.h" -#include using namespace winrt::Microsoft::Terminal::Settings::Model; diff --git a/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp b/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp index 2e0c81e5a5e..abb58acd069 100644 --- a/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp @@ -8,7 +8,6 @@ #include "../../inc/DefaultSettings.h" #include "DynamicProfileUtils.h" -#include static constexpr std::wstring_view WslHomeDirectory{ L"~" }; static constexpr std::wstring_view DockerDistributionPrefix{ L"docker-desktop" }; diff --git a/src/cascadia/TerminalSettingsModel/init.cpp b/src/cascadia/TerminalSettingsModel/init.cpp index 2ac0825bbaa..8c6ab3b7461 100644 --- a/src/cascadia/TerminalSettingsModel/init.cpp +++ b/src/cascadia/TerminalSettingsModel/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // Note: Generate GUID using TlgGuid.exe tool diff --git a/src/cascadia/TerminalSettingsModel/pch.h b/src/cascadia/TerminalSettingsModel/pch.h index dcfb26edf12..6867bda3f61 100644 --- a/src/cascadia/TerminalSettingsModel/pch.h +++ b/src/cascadia/TerminalSettingsModel/pch.h @@ -64,3 +64,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider); #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/UIHelpers/TextMenuFlyout.cpp b/src/cascadia/UIHelpers/TextMenuFlyout.cpp index 57dbc486f9e..88d3d64db5e 100644 --- a/src/cascadia/UIHelpers/TextMenuFlyout.cpp +++ b/src/cascadia/UIHelpers/TextMenuFlyout.cpp @@ -4,8 +4,6 @@ #include "pch.h" #include "TextMenuFlyout.h" -#include - #include "TextMenuFlyout.g.cpp" using namespace ::winrt::Windows::UI::Xaml; diff --git a/src/cascadia/UIHelpers/init.cpp b/src/cascadia/UIHelpers/init.cpp index 6a22285bac8..2566e6f4490 100644 --- a/src/cascadia/UIHelpers/init.cpp +++ b/src/cascadia/UIHelpers/init.cpp @@ -3,8 +3,6 @@ #include "pch.h" -#include - #pragma warning(suppress : 26440) // Not interested in changing the specification of DllMain to make it noexcept given it's an interface to the OS. BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD reason, LPVOID /*reserved*/) { diff --git a/src/cascadia/UIHelpers/pch.h b/src/cascadia/UIHelpers/pch.h index 5d22e5e502a..d660a8d832a 100644 --- a/src/cascadia/UIHelpers/pch.h +++ b/src/cascadia/UIHelpers/pch.h @@ -43,3 +43,5 @@ #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/UIMarkdown/CodeBlock.cpp b/src/cascadia/UIMarkdown/CodeBlock.cpp index 0644157d8e5..60a888889c5 100644 --- a/src/cascadia/UIMarkdown/CodeBlock.cpp +++ b/src/cascadia/UIMarkdown/CodeBlock.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "CodeBlock.h" -#include #include "CodeBlock.g.cpp" #include "RequestRunCommandsArgs.g.cpp" diff --git a/src/cascadia/UIMarkdown/pch.h b/src/cascadia/UIMarkdown/pch.h index 562900ebb96..a91ac93c9ae 100644 --- a/src/cascadia/UIMarkdown/pch.h +++ b/src/cascadia/UIMarkdown/pch.h @@ -43,3 +43,5 @@ #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/WindowsTerminal/WindowEmperor.cpp b/src/cascadia/WindowsTerminal/WindowEmperor.cpp index c19d2f22d5a..e84f216e5f9 100644 --- a/src/cascadia/WindowsTerminal/WindowEmperor.cpp +++ b/src/cascadia/WindowsTerminal/WindowEmperor.cpp @@ -5,7 +5,6 @@ #include "WindowEmperor.h" #include -#include #include #include #include diff --git a/src/cascadia/WindowsTerminal/main.cpp b/src/cascadia/WindowsTerminal/main.cpp index 9f4c5f2c701..b15f7c32c67 100644 --- a/src/cascadia/WindowsTerminal/main.cpp +++ b/src/cascadia/WindowsTerminal/main.cpp @@ -28,7 +28,6 @@ TRACELOGGING_DEFINE_PROVIDER( // we still need to be able to localize strings for the notification icon menu. Anything // you want localized for WindowsTerminal.exe should be stuck in // ...\TerminalApp\Resources\en-US\Resources.resw -#include UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"TerminalApp/Resources"); // Routine Description: diff --git a/src/cascadia/WindowsTerminal/pch.h b/src/cascadia/WindowsTerminal/pch.h index 87a0ade3064..2b48aae8c92 100644 --- a/src/cascadia/WindowsTerminal/pch.h +++ b/src/cascadia/WindowsTerminal/pch.h @@ -95,3 +95,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider); #include #include // must go after the CoreDispatcher type is defined + +#include