diff --git a/src/host/tracing.hpp b/src/host/tracing.hpp
index 32c441f45..a54b7c9bc 100644
--- a/src/host/tracing.hpp
+++ b/src/host/tracing.hpp
@@ -17,6 +17,8 @@ Author(s):
 
 #pragma once
 
+#include <functional>
+
 #include "../types/inc/Viewport.hpp"
 
 namespace Microsoft::Console::Interactivity::Win32
diff --git a/src/inc/HostAndPropsheetIncludes.h b/src/inc/HostAndPropsheetIncludes.h
index 87bad9ec7..9aaf241c7 100644
--- a/src/inc/HostAndPropsheetIncludes.h
+++ b/src/inc/HostAndPropsheetIncludes.h
@@ -35,8 +35,6 @@ typedef NTSTATUS *PNTSTATUS;
 
 #include <winuser.h>
 
-#include <uxtheme.h>
-
 #include <cwchar>
 
 // Only remaining item from w32gdip.h. There's probably a better way to do this as well.
diff --git a/src/propsheet/TerminalPage.cpp b/src/propsheet/TerminalPage.cpp
index cbae87115..f7e5b0a9d 100644
--- a/src/propsheet/TerminalPage.cpp
+++ b/src/propsheet/TerminalPage.cpp
@@ -4,6 +4,7 @@
 #include "precomp.h"
 #include "TerminalPage.h"
 #include "ColorControl.h"
+#include <functional>
 
 // From conattrs.h
 const COLORREF INVALID_COLOR = 0xffffffff;
diff --git a/src/renderer/dx/DxRenderer.hpp b/src/renderer/dx/DxRenderer.hpp
index 831d198ed..80d07b47b 100644
--- a/src/renderer/dx/DxRenderer.hpp
+++ b/src/renderer/dx/DxRenderer.hpp
@@ -5,6 +5,8 @@
 
 #include "../../renderer/inc/RenderEngineBase.hpp"
 
+#include <functional>
+
 #include <dxgi.h>
 #include <dxgi1_2.h>
 
diff --git a/src/terminal/parser/OutputStateMachineEngine.hpp b/src/terminal/parser/OutputStateMachineEngine.hpp
index 5ef8de6be..1cd8bd2a1 100644
--- a/src/terminal/parser/OutputStateMachineEngine.hpp
+++ b/src/terminal/parser/OutputStateMachineEngine.hpp
@@ -10,6 +10,8 @@ Abstract:
 */
 #pragma once
 
+#include <functional>
+
 #include "../adapter/termDispatch.hpp"
 #include "telemetry.hpp"
 #include "IStateMachineEngine.hpp"
diff --git a/src/types/inc/CodepointWidthDetector.hpp b/src/types/inc/CodepointWidthDetector.hpp
index f4324f4c8..9055063f3 100644
--- a/src/types/inc/CodepointWidthDetector.hpp
+++ b/src/types/inc/CodepointWidthDetector.hpp
@@ -14,6 +14,7 @@ Author:
 #pragma once
 
 #include "convert.hpp"
+#include <functional>
 
 static_assert(sizeof(unsigned int) == sizeof(wchar_t) * 2,
               "UnicodeRange expects to be able to store a unicode codepoint in an unsigned int");
diff --git a/src/types/inc/GlyphWidth.hpp b/src/types/inc/GlyphWidth.hpp
index 87190617c..e12261a6f 100644
--- a/src/types/inc/GlyphWidth.hpp
+++ b/src/types/inc/GlyphWidth.hpp
@@ -9,6 +9,9 @@ Abstract:
 
 */
 
+#include <functional>
+#include <string_view>
+
 bool IsGlyphFullWidth(const std::wstring_view glyph);
 bool IsGlyphFullWidth(const wchar_t wch);
 void SetGlyphWidthFallback(std::function<bool(std::wstring_view)> pfnFallback);
diff --git a/src/types/inc/convert.hpp b/src/types/inc/convert.hpp
index 44c6783c0..6d51653c1 100644
--- a/src/types/inc/convert.hpp
+++ b/src/types/inc/convert.hpp
@@ -15,6 +15,8 @@ Author:
 
 #pragma once
 #include <deque>
+#include <string>
+#include <string_view>
 #include <memory>
 #include "IInputEvent.hpp"