From d74d3080ffdd358c595cf363f4053860d8fbb17d Mon Sep 17 00:00:00 2001
From: Timo Rothenpieler <timo@rothenpieler.org>
Date: Sun, 14 Sep 2025 18:47:02 +0200
Subject: [PATCH] avfilter/vsrc_gfxcapture: make checkheaders happy

---
 libavfilter/vsrc_gfxcapture.h                 |  4 ++++
 libavfilter/vsrc_gfxcapture_winrt.cpp         | 23 ++----------------
 ...ture_winrt.h => vsrc_gfxcapture_winrt.hpp} | 24 +++++++++++++++++++
 3 files changed, 30 insertions(+), 21 deletions(-)
 rename libavfilter/{vsrc_gfxcapture_winrt.h => vsrc_gfxcapture_winrt.hpp} (92%)

diff --git a/libavfilter/vsrc_gfxcapture.h b/libavfilter/vsrc_gfxcapture.h
index 617f48de22..f541f9ba21 100644
--- a/libavfilter/vsrc_gfxcapture.h
+++ b/libavfilter/vsrc_gfxcapture.h
@@ -19,6 +19,10 @@
 #ifndef AVFILTER_VSRC_GFXCAPTURE_H
 #define AVFILTER_VSRC_GFXCAPTURE_H
 
+#include "libavutil/log.h"
+#include "libavutil/rational.h"
+#include "libavfilter/avfilter.h"
+
 typedef struct GfxCaptureContextCpp GfxCaptureContextCpp;
 
 enum GfxResizeMode {
diff --git a/libavfilter/vsrc_gfxcapture_winrt.cpp b/libavfilter/vsrc_gfxcapture_winrt.cpp
index 42977efcc5..89cbdd3df9 100644
--- a/libavfilter/vsrc_gfxcapture_winrt.cpp
+++ b/libavfilter/vsrc_gfxcapture_winrt.cpp
@@ -16,24 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-extern "C" {
-#include "config.h"
-}
+#include "vsrc_gfxcapture_winrt.hpp"
+#include "vsrc_gfxcapture_shader.h"
 
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0A00
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0A00
-#endif
-
-#define WINDOWS_FOUNDATION_UNIVERSALAPICONTRACT_VERSION 0x130000
-
-// work around bug in mingw double-defining IReference<unsigned char> (BYTE == boolean)
-#define ____FIReference_1_boolean_INTERFACE_DEFINED__
-
-#include <windows.h>
-#include <initguid.h>
-#include <wrl.h>
-#include <roapi.h>
 #include <dwmapi.h>
 #include <d3d11.h>
 #include <d3dcompiler.h>
@@ -66,16 +51,12 @@ extern "C" {
 #include <atomic>
 #include <cinttypes>
 #include <condition_variable>
-#include <functional>
 #include <memory>
 #include <mutex>
 #include <regex>
 #include <string>
 #include <type_traits>
 
-#include "vsrc_gfxcapture_winrt.h"
-#include "vsrc_gfxcapture_shader.h"
-
 using namespace ABI::Windows::System;
 using namespace ABI::Windows::Foundation;
 using namespace ABI::Windows::Graphics::Capture;
diff --git a/libavfilter/vsrc_gfxcapture_winrt.h b/libavfilter/vsrc_gfxcapture_winrt.hpp
similarity index 92%
rename from libavfilter/vsrc_gfxcapture_winrt.h
rename to libavfilter/vsrc_gfxcapture_winrt.hpp
index d6f11e4ef5..a02e768c8f 100644
--- a/libavfilter/vsrc_gfxcapture_winrt.h
+++ b/libavfilter/vsrc_gfxcapture_winrt.hpp
@@ -19,6 +19,30 @@
 #ifndef AVFILTER_VSRC_GFXCAPTURE_WINRT_H
 #define AVFILTER_VSRC_GFXCAPTURE_WINRT_H
 
+extern "C" {
+#include "config.h"
+}
+
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0A00
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0A00
+#endif
+
+#define WINDOWS_FOUNDATION_UNIVERSALAPICONTRACT_VERSION 0x130000
+
+// work around bug in mingw double-defining IReference<unsigned char> (BYTE == boolean)
+#define ____FIReference_1_boolean_INTERFACE_DEFINED__
+
+#include <windows.h>
+#include <initguid.h>
+#include <wrl.h>
+#include <roapi.h>
+#include <windows.foundation.h>
+
+#include <atomic>
+#include <functional>
+#include <memory>
+
 // Forward-declare IDirect3DDxgiInterfaceAccess if headers too old
 #if !HAVE_IDIRECT3DDXGIINTERFACEACCESS
 namespace Windows::Graphics::DirectX::Direct3D11 {