diff --git a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
index 747db000158..3808e6e1e48 100644
--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
@@ -1313,6 +1313,7 @@ void showProperty(NCRYPT_HANDLE hKey) {
     EXPORT_BLOB(NCRYPT_PKCS7_ENVELOPE_BLOB);
     //EXPORT_BLOB(NCRYPTBUFFER_CERT_BLOB);
     //EXPORT_BLOB(NCRYPT_PKCS8_PRIVATE_KEY_BLOB);
+    /*
     BCryptBuffer bb;
     bb.BufferType = NCRYPTBUFFER_PKCS_SECRET;
     bb.cbBuffer = 18;
@@ -1321,6 +1322,7 @@ void showProperty(NCRYPT_HANDLE hKey) {
     bbd.ulVersion = 0;
     bbd.cBuffers = 1;
     bbd.pBuffers = &bb;
+    */
     if(::NCryptExportKey(hKey, NULL, NCRYPT_PKCS8_PRIVATE_KEY_BLOB, NULL,
             (PBYTE)buffer, 8192, &len, NCRYPT_SILENT_FLAG) == ERROR_SUCCESS) {
         snprintf(header, sizeof(header), "NCRYPT_PKCS8_PRIVATE_KEY_BLOB %ls", NCRYPT_PKCS8_PRIVATE_KEY_BLOB);
diff --git a/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c b/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
index 4f7a520dd76..df07b753f0e 100644
--- a/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
+++ b/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
@@ -37,8 +37,6 @@
  * yet.
  */
 
-static HANDLE memHandle = NULL;
-
 int
 sysSharedMemCreate(const char *name, int length,
                    sys_shmem_t *mem, void **buffer)
diff --git a/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h b/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
index dc8caf18273..6c86473625f 100644
--- a/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
+++ b/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
@@ -31,8 +31,8 @@
 
 #define MUTEX_T         int
 #define MUTEX_INIT      0
-#define MUTEX_LOCK(x)           /* FIXUP? */
-#define MUTEX_UNLOCK(x)         /* FIXUP? */
+#define MUTEX_LOCK(x)   ((void) (x))        /* FIXUP? */
+#define MUTEX_UNLOCK(x) ((void) (x))        /* FIXUP? */
 #define GET_THREAD_ID() GetCurrentThreadId()
 #define THREAD_T        unsigned long
 #define PID_T           int
diff --git a/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp b/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp
index 7b0b8fa5a74..122757b3ac3 100644
--- a/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp
+++ b/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,7 +180,6 @@ void VersionInfo::fillBuffer(std::ostream& buf) const {
     write(buf, createFIXEDFILEINFO()); // Value
     add32bitPadding(buf); // Padding2
 
-    const DWORD neutralLangId = (0x04b0 | MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) << 16);
     const DWORD engLangId = (0x04b0 | MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US) << 16);
 
     do {