diff --git a/client/X11/xf_input.c b/client/X11/xf_input.c
index e288ecaf9..82f6f99fb 100644
--- a/client/X11/xf_input.c
+++ b/client/X11/xf_input.c
@@ -51,6 +51,7 @@
 
 static int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, int evtype);
 
+#ifdef DEBUG_XINPUT
 static const char* xf_input_get_class_string(int class)
 {
 	if (class == XIKeyClass)
@@ -66,6 +67,7 @@ static const char* xf_input_get_class_string(int class)
 
 	return "XIUnknownClass";
 }
+#endif
 
 static BOOL register_input_events(xfContext* xfc, Window window)
 {
@@ -875,17 +877,11 @@ static int xf_input_handle_event_remote(xfContext* xfc, const XEvent* event)
 				/* fallthrough */
 				WINPR_FALLTHROUGH
 			case XI_TouchUpdate:
-				/* fallthrough */
-				WINPR_FALLTHROUGH
 			case XI_TouchEnd:
 				xf_input_touch_remote(xfc, cookie.cc->data, cookie.cc->evtype);
 				break;
 			case XI_ButtonPress:
-				/* fallthrough */
-				WINPR_FALLTHROUGH
 			case XI_Motion:
-				/* fallthrough */
-				WINPR_FALLTHROUGH
 			case XI_ButtonRelease:
 			{
 				WLog_DBG(TAG, "checking for pen");
diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
index f75304acf..ee23cbd34 100644
--- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
+++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
@@ -209,11 +209,7 @@ static CK_RV object_load_attributes(NCryptP11ProviderHandle* provider, CK_SESSIO
 			/* fallthrough */
 			WINPR_FALLTHROUGH
 		case CKR_ATTRIBUTE_SENSITIVE:
-			/* fallthrough */
-			WINPR_FALLTHROUGH
 		case CKR_ATTRIBUTE_TYPE_INVALID:
-			/* fallthrough */
-			WINPR_FALLTHROUGH
 		case CKR_BUFFER_TOO_SMALL:
 			/* attributes need some buffers for the result value */
 			if (!attributes_allocate_buffers(attributes, count))