diff --git a/include/my_global.h b/include/my_global.h
index ed213e69f85..27df0da1454 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -29,7 +29,7 @@
 #pragma GCC poison __WIN__
 #endif
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 /*
   Following functions have bugs, when used with UTF-8 active codepage.
   #include <winservice.h> will use the non-buggy wrappers
diff --git a/sql/winservice.h b/sql/winservice.h
index a14ee73d146..aa0528be5ee 100644
--- a/sql/winservice.h
+++ b/sql/winservice.h
@@ -166,7 +166,6 @@ static inline BOOL my_ChangeServiceConfig(SC_HANDLE hService, DWORD dwServiceTyp
   wchar_t *w_Dependencies= NULL;
   wchar_t *w_ServiceStartName= NULL;
   wchar_t *w_Password= NULL;
-  SC_HANDLE sch = NULL;
   DWORD last_error=0;
   BOOL ok= TRUE;