PCH: remove headers which are actually could be changed (#950)

src/common/hwnd_data_cache.h

@@ -4,6 +4,8 @@
 #include <string>
 #include <Windows.h>
 
+#include "common.h"
+
 class HWNDDataCache {
 public:
   WindowAndProcPath get_window_and_path(HWND hwnd);

src/common/monitors.cpp

@@ -1,4 +1,6 @@
 #include "pch.h"
+
+#include "common.h"
 #include "monitors.h"
 
 bool operator==(const ScreenSize& lhs, const ScreenSize& rhs) {

src/common/pch.h

@@ -23,4 +23,3 @@
 #include <string>
 #include <vector>
 
-#include "common.h"

src/modules/example_powertoy/pch.h

@@ -1,5 +1,4 @@
 #pragma once
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <common/common.h>
 #include <ProjectTelemetry.h>

src/modules/fancyzones/dll/dllmain.cpp

@@ -7,6 +7,10 @@
 #include <lib/ZoneSet.h>
 #include <lib/RegistryHelpers.h>
 
+#include <lib/trace.h>
+#include <lib/Settings.h>
+#include <lib/FancyZones.h>
+
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)

src/modules/fancyzones/dll/pch.h

@@ -8,9 +8,6 @@
 #include <wil\common.h>
 #include <wil\result.h>
 
-#include "lib\trace.h"
-#include "lib\FancyZones.h"
-#include "lib\Settings.h"
 
 namespace winrt
 {

src/modules/fancyzones/lib/FancyZones.cpp

@@ -2,7 +2,14 @@
 #include "common/dpi_aware.h"
 #include "common/on_thread_executor.h"
 
+#include "FancyZones.h"
+#include "lib/Settings.h"
+#include "lib/ZoneWindow.h"
+#include "lib/RegistryHelpers.h"
+#include "trace.h"
+
 #include <functional>
+#include <common/common.h>
 
 namespace std
 {

src/modules/fancyzones/lib/Settings.cpp

@@ -1,5 +1,8 @@
 #include "pch.h"
 #include <common/settings_objects.h>
+#include "lib/Settings.h"
+#include "lib/FancyZones.h"
+#include "trace.h"
 
 struct FancyZonesSettings : winrt::implements<FancyZonesSettings, IFancyZonesSettings>
 {

src/modules/fancyzones/lib/Zone.cpp

@@ -1,5 +1,8 @@
 #include "pch.h"
 
+#include "Zone.h"
+#include "Settings.h"
+
 struct Zone : winrt::implements<Zone, IZone>
 {
 public:

src/modules/fancyzones/lib/ZoneSet.cpp

@@ -1,5 +1,8 @@
 #include "pch.h"
 
+#include "lib/ZoneSet.h"
+#include "lib/RegistryHelpers.h"
+
 struct ZoneSet : winrt::implements<ZoneSet, IZoneSet>
 {
 public:

src/modules/fancyzones/lib/ZoneWindow.cpp

@@ -1,6 +1,13 @@
 #include "pch.h"
+
+#include <common/common.h>
 #include <common/dpi_aware.h>
 
+#include "ZoneWindow.h"
+#include "trace.h"
+#include "util.h"
+#include "RegistryHelpers.h"
+
 #include <ShellScalingApi.h>
 
 struct ZoneWindow : public winrt::implements<ZoneWindow, IZoneWindow>

src/modules/fancyzones/lib/ZoneWindow.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "FancyZones.h"
+#include "lib/ZoneSet.h"
 
 interface __declspec(uuid("{7F017528-8110-4FB3-BE41-F472969C2560}")) IZoneWindow : public IUnknown
 {

src/modules/fancyzones/lib/pch.h

@@ -16,16 +16,6 @@
 #include <windows.foundation.h>
 #include <psapi.h>
 
-#include "trace.h"
-#include "Settings.h"
-#include "FancyZones.h"
-#include "ZoneWindow.h"
-#include "ZoneSet.h"
-#include "Zone.h"
-#include "util.h"
-#include "common/common.h"
-#include "RegistryHelpers.h"
-
 #pragma comment(lib, "windowsapp")
 
 namespace winrt

src/modules/fancyzones/lib/trace.cpp

@@ -1,5 +1,7 @@
 #include "pch.h"
 #include "trace.h"
+#include "lib/ZoneSet.h"
+#include "lib/Settings.h"
 
 TRACELOGGING_DEFINE_PROVIDER(
     g_hProvider,

src/modules/fancyzones/tests/UnitTests/Zone.Spec.cpp

@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "lib\Zone.h"
 
+#include "Util.h"
+
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 
 namespace FancyZonesUnitTests

src/modules/fancyzones/tests/UnitTests/ZoneSet.Spec.cpp

@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "lib\ZoneSet.h"
 
+#include "Util.h"
+
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 
 namespace FancyZonesUnitTests

src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp

@@ -1,6 +1,9 @@
 #include "pch.h"
-#include "lib\ZoneSet.h"
 
+#include <lib/util.h>
+#include <lib/ZoneSet.h>
+#include <lib/ZoneWindow.h>
+#include "Util.h"
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 
 namespace FancyZonesUnitTests

src/modules/fancyzones/tests/UnitTests/pch.h

@@ -13,6 +13,5 @@
 
 #include "lib\pch.h"
 #include "CppUnitTest.h"
-#include "Util.h"
 
 #endif //PCH_H

src/modules/powerrename/dll/stdafx.h

@@ -11,7 +11,6 @@
 #include <atlbase.h>
 #include <Shobjidl.h>
 #include <Shlobj.h>
-#include "common/common.h"
 
 void DllAddRef();
 void DllRelease();

src/modules/powerrename/lib/Helpers.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <common.h>
+#include <lib/PowerRenameInterfaces.h>
+
 HRESULT EnumerateDataObject(_In_ IDataObject* pdo, _In_ IPowerRenameManager* psrm);
 HRESULT GetIconIndexFromPath(_In_ PCWSTR path, _Out_ int* index);
 HBITMAP CreateBitmapFromIcon(_In_ HICON hIcon, _In_opt_ UINT width = 0, _In_opt_ UINT height = 0);

src/modules/powerrename/lib/PowerRenameManager.h

@@ -3,6 +3,9 @@
 #include <map>
 #include "srwlock.h"
 
+#include <lib/PowerRenameManager.h>
+#include <lib/PowerRenameInterfaces.h>
+
 class CPowerRenameManager :
     public IPowerRenameManager,
     public IPowerRenameRegExEvents

src/modules/powerrename/lib/PowerRenameRegEx.h

@@ -4,6 +4,8 @@
 #include <string>
 #include "srwlock.h"
 
+#include "PowerRenameInterfaces.h"
+
 #define DEFAULT_FLAGS MatchAllOccurences
 
 class CPowerRenameRegEx : public IPowerRenameRegEx

src/modules/powerrename/lib/Settings.cpp

@@ -2,6 +2,7 @@
 #include "stdafx.h"
 #include <commctrl.h>
 #include "Settings.h"
+#include "PowerRenameInterfaces.h"
 
 const wchar_t c_rootRegPath[] = L"Software\\Microsoft\\PowerRename";
 const wchar_t c_mruSearchRegPath[] = L"SearchMRU";

src/modules/powerrename/lib/stdafx.h

@@ -19,5 +19,3 @@
 #include <shlwapi.h>
 
 #include <ProjectTelemetry.h>
-
-#include "PowerRenameInterfaces.h"

src/modules/powerrename/unittests/MockPowerRenameRegExEvents.h

@@ -2,6 +2,7 @@
 #include <vector>
 #include "srwlock.h"
 
+#include "PowerRenameInterfaces.h"
 class CMockPowerRenameRegExEvents :
     public IPowerRenameRegExEvents
 {

src/modules/shortcut_guide/overlay_window.cpp

@@ -6,6 +6,7 @@
 #include "keyboard_state.h"
 #include "shortcut_guide.h"
 #include "trace.h"
+#include <common/common.h>
 
 D2DOverlaySVG& D2DOverlaySVG::load(const std::wstring& filename, ID2D1DeviceContext5* d2d_dc)
 {

src/modules/shortcut_guide/pch.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "resource.h"
 #include <winrt/base.h>
 #include <Windows.h>
 #include <dxgi1_3.h>
@@ -23,5 +22,4 @@
 #include <tuple>
 #include <unordered_set>
 #include <string>
-#include <common/common.h>
 #include <ProjectTelemetry.h>

src/modules/shortcut_guide/shortcut_guide.cpp

@@ -2,6 +2,8 @@
 #include "shortcut_guide.h"
 #include "target_state.h"
 #include "trace.h"
+
+#include <common/common.h>
 #include <common/settings_objects.h>
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;

src/modules/shortcut_guide/shortcut_guide.h

@@ -3,6 +3,8 @@
 #include <interface/lowlevel_keyboard_event_data.h>
 #include "overlay_window.h"
 
+#include "resource.h"
+
 // We support only one instance of the overlay
 extern class OverlayWindow* instance;
 

src/runner/general_settings.cpp

@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "general_settings.h"
 #include "auto_start_helper.h"
+
+#include <common/common.h>
 #include <common/settings_helpers.h>
 #include "powertoy_module.h"
 #include <common/windows_colors.h>

src/runner/main.cpp

@@ -10,6 +10,7 @@
 #include "restart_elevated.h"
 #include "resource.h"
 
+#include <common/common.h>
 #include <common/dpi_aware.h>
 
 #if _DEBUG && _WIN64

src/runner/pch.h

@@ -22,5 +22,4 @@
 #include <tuple>
 #include <unordered_set>
 #include <string>
-#include <common/common.h>
 #include <ProjectTelemetry.h>

src/runner/tray_icon.cpp

@@ -3,6 +3,7 @@
 #include "settings_window.h"
 #include "tray_icon.h"
 #include <Windows.h>
+#include <common/common.h>
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;