diff --git a/client/SDL/SDL3/sdl_clip.cpp b/client/SDL/SDL3/sdl_clip.cpp
index 172576a3b..6b12faa19 100644
--- a/client/SDL/SDL3/sdl_clip.cpp
+++ b/client/SDL/SDL3/sdl_clip.cpp
@@ -183,7 +183,7 @@ bool sdlClip::contains(const char** mime_types, Sint32 count)
 	return false;
 }
 
-bool sdlClip::handle_update(const SDL_ClipboardEvent& ev)
+bool sdlClip::handleEvent(const SDL_ClipboardEvent& ev)
 {
 	if (!_ctx || !_sync || ev.owner)
 	{
diff --git a/client/SDL/SDL3/sdl_clip.hpp b/client/SDL/SDL3/sdl_clip.hpp
index e4497e111..b753fe0f2 100644
--- a/client/SDL/SDL3/sdl_clip.hpp
+++ b/client/SDL/SDL3/sdl_clip.hpp
@@ -87,7 +87,7 @@ class sdlClip
 	[[nodiscard]] bool init(CliprdrClientContext* clip);
 	[[nodiscard]] bool uninit(CliprdrClientContext* clip);
 
-	[[nodiscard]] bool handle_update(const SDL_ClipboardEvent& ev);
+	[[nodiscard]] bool handleEvent(const SDL_ClipboardEvent& ev);
 
   private:
 	[[nodiscard]] UINT SendClientCapabilities();
diff --git a/client/SDL/SDL3/sdl_context.cpp b/client/SDL/SDL3/sdl_context.cpp
index e311340ff..acf47d7e4 100644
--- a/client/SDL/SDL3/sdl_context.cpp
+++ b/client/SDL/SDL3/sdl_context.cpp
@@ -1096,6 +1096,11 @@ bool SdlContext::handleEvent(const SDL_Event& ev)
 			const auto& cev = ev.wheel;
 			return handleEvent(cev);
 		}
+		case SDL_EVENT_CLIPBOARD_UPDATE:
+		{
+			const auto& cev = ev.clipboard;
+			return getClipboardChannelContext().handleEvent(cev);
+		}
 		default:
 			return true;
 	}
diff --git a/client/SDL/SDL3/sdl_freerdp.cpp b/client/SDL/SDL3/sdl_freerdp.cpp
index 4299bd7ac..2f2c08579 100644
--- a/client/SDL/SDL3/sdl_freerdp.cpp
+++ b/client/SDL/SDL3/sdl_freerdp.cpp
@@ -235,10 +235,6 @@ static void sdl_term_handler([[maybe_unused]] int signum, [[maybe_unused]] const
 					if (!sdl_Pointer_Set_Process(sdl))
 						return -1;
 					break;
-				case SDL_EVENT_CLIPBOARD_UPDATE:
-					if (!sdl->getClipboardChannelContext().handle_update(windowEvent.clipboard))
-						return -1;
-					break;
 				case SDL_EVENT_USER_QUIT:
 				default:
 					break;
diff --git a/winpr/include/winpr/platform.h b/winpr/include/winpr/platform.h
index 702b82e8b..64fe8c068 100644
--- a/winpr/include/winpr/platform.h
+++ b/winpr/include/winpr/platform.h
@@ -533,9 +533,7 @@ WINPR_PRAGMA_DIAG_POP
 #define WINPR_DEPRECATED_VAR(text, obj) obj
 #endif
 
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202202L)
-#define WINPR_NORETURN(obj) [[noreturn]] obj
-#elif defined(WIN32) && !defined(__CYGWIN__)
+#if defined(WIN32) && !defined(__CYGWIN__)
 #define WINPR_NORETURN(obj) __declspec(noreturn) obj
 #elif defined(__GNUC__)
 #define WINPR_NORETURN(obj) __attribute__((__noreturn__)) obj