diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c
index c0053c569..5b37d039a 100644
--- a/channels/drdynvc/client/drdynvc_main.c
+++ b/channels/drdynvc/client/drdynvc_main.c
@@ -456,9 +456,9 @@ static void check_open_close_receive(DVCMAN_CHANNEL* channel)
 	WINPR_ASSERT(cb);
 	if (!cb->OnOpen || !cb->OnClose || !cb->OnDataReceived)
 		WLog_VRB(TAG, "{%s:%" PRIu32 "} OnOpen=%p, OnClose=%p, OnDataReceived=%p", name, id,
-		         WINPR_CXX_COMPAT_CAST(const void*, cb->OnOpen),
-		         WINPR_CXX_COMPAT_CAST(const void*, cb->OnClose),
-		         WINPR_CXX_COMPAT_CAST(const void*, cb->OnDataReceived));
+		         WINPR_FUNC_PTR_CAST(cb->OnOpen, const void*),
+		         WINPR_FUNC_PTR_CAST(cb->OnClose, const void*),
+		         WINPR_FUNC_PTR_CAST(cb->OnDataReceived, const void*));
 }
 
 static UINT dvcman_call_on_receive(DVCMAN_CHANNEL* channel, wStream* data)
diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c
index 0e695f5fe..c52abe056 100644
--- a/libfreerdp/core/client.c
+++ b/libfreerdp/core/client.c
@@ -851,8 +851,8 @@ BOOL freerdp_client_channel_register(rdpChannels* channels, HANDLE handle,
 	if (!channels || (handle == INVALID_HANDLE_VALUE) || !fkt)
 	{
 		WLog_ERR(TAG, "Invalid function arguments (channels=%p, handle=%p, fkt=%p, userdata=%p",
-		         WINPR_CXX_COMPAT_CAST(const void*, channels), handle,
-		         WINPR_CXX_COMPAT_CAST(const void*, fkt), userdata);
+		         WINPR_FUNC_PTR_CAST(channels, const void*), handle,
+		         WINPR_FUNC_PTR_CAST(fkt, const void*), userdata);
 		return FALSE;
 	}
 
diff --git a/winpr/libwinpr/smartcard/smartcard.c b/winpr/libwinpr/smartcard/smartcard.c
index 004a1a96f..2fbd949f9 100644
--- a/winpr/libwinpr/smartcard/smartcard.c
+++ b/winpr/libwinpr/smartcard/smartcard.c
@@ -44,43 +44,40 @@ static const SCardApiFunctionTable* g_SCardApi = nullptr;
 #define xstr(s) str(s)
 #define str(s) #s
 
-#define SCARDAPI_STUB_CALL_LONG(_name, ...)                                                     \
-	if (!InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, nullptr, nullptr))        \
-		return SCARD_E_NO_SERVICE;                                                              \
-	if (!g_SCardApi || !g_SCardApi->pfn##_name)                                                 \
-	{                                                                                           \
-		WLog_DBG(                                                                               \
-		    TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p",             \
-		    WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi),                                     \
-		    WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi ? g_SCardApi->pfn##_name : nullptr)); \
-		return SCARD_E_NO_SERVICE;                                                              \
-	}                                                                                           \
+#define SCARDAPI_STUB_CALL_LONG(_name, ...)                                                        \
+	if (!InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, nullptr, nullptr))           \
+		return SCARD_E_NO_SERVICE;                                                                 \
+	if (!g_SCardApi || !g_SCardApi->pfn##_name)                                                    \
+	{                                                                                              \
+		WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p",           \
+		         WINPR_FUNC_PTR_CAST(g_SCardApi, const void*),                                     \
+		         WINPR_FUNC_PTR_CAST(g_SCardApi ? g_SCardApi->pfn##_name : nullptr, const void*)); \
+		return SCARD_E_NO_SERVICE;                                                                 \
+	}                                                                                              \
 	return g_SCardApi->pfn##_name(__VA_ARGS__)
 
-#define SCARDAPI_STUB_CALL_HANDLE(_name)                                                        \
-	if (!InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, nullptr, nullptr))        \
-		return nullptr;                                                                         \
-	if (!g_SCardApi || !g_SCardApi->pfn##_name)                                                 \
-	{                                                                                           \
-		WLog_DBG(                                                                               \
-		    TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p",             \
-		    WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi),                                     \
-		    WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi ? g_SCardApi->pfn##_name : nullptr)); \
-		return nullptr;                                                                         \
-	}                                                                                           \
+#define SCARDAPI_STUB_CALL_HANDLE(_name)                                                           \
+	if (!InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, nullptr, nullptr))           \
+		return nullptr;                                                                            \
+	if (!g_SCardApi || !g_SCardApi->pfn##_name)                                                    \
+	{                                                                                              \
+		WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p",           \
+		         WINPR_FUNC_PTR_CAST(g_SCardApi, const void*),                                     \
+		         WINPR_FUNC_PTR_CAST(g_SCardApi ? g_SCardApi->pfn##_name : nullptr, const void*)); \
+		return nullptr;                                                                            \
+	}                                                                                              \
 	return g_SCardApi->pfn##_name()
 
-#define SCARDAPI_STUB_CALL_VOID(_name)                                                          \
-	if (!InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, nullptr, nullptr))        \
-		return;                                                                                 \
-	if (!g_SCardApi || !g_SCardApi->pfn##_name)                                                 \
-	{                                                                                           \
-		WLog_DBG(                                                                               \
-		    TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p",             \
-		    WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi),                                     \
-		    WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi ? g_SCardApi->pfn##_name : nullptr)); \
-		return;                                                                                 \
-	}                                                                                           \
+#define SCARDAPI_STUB_CALL_VOID(_name)                                                             \
+	if (!InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, nullptr, nullptr))           \
+		return;                                                                                    \
+	if (!g_SCardApi || !g_SCardApi->pfn##_name)                                                    \
+	{                                                                                              \
+		WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p",           \
+		         WINPR_FUNC_PTR_CAST(g_SCardApi, const void*),                                     \
+		         WINPR_FUNC_PTR_CAST(g_SCardApi ? g_SCardApi->pfn##_name : nullptr, const void*)); \
+		return;                                                                                    \
+	}                                                                                              \
 	g_SCardApi->pfn##_name()
 
 /**