diff --git a/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp
index 07aae61b044..0c48cd2a1ea 100644
--- a/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp
+++ b/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeEventHandler.cpp
@@ -188,7 +188,7 @@ AccessBridgeEventHandler::firePropertyChange(long vmID,
 #ifdef ACCESSBRIDGE_ARCH_LEGACY // JOBJECT64 is jobject (32 bit pointer)
 DEBUG_CODE(const char fireEventDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s(%p, %p); vmID = %X\r\n");
 #else // JOBJECT64 is jlong (64 bit)
-DEBUG_CODE(const char fireEventDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s(%016I64X, %016I64X); vmID = %X\r\n");
+DEBUG_CODE(const char fireEventDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s(%016llX, %016llX); vmID = %lX\r\n");
 #endif
 
 #define FIRE_EVENT(method, FPprototype, eventFP) \
@@ -243,7 +243,7 @@ FIRE_EVENT(firePopupMenuWillBecomeVisible, AccessBridge_PopupMenuWillBecomeVisib
 #ifdef ACCESSBRIDGE_ARCH_LEGACY // JOBJECT64 is jobject (32 bit pointer)
 DEBUG_CODE(const char firePropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing a no-param property change (%p, %p):\r\n");
 #else // JOBJECT64 is jlong (64 bit)
-DEBUG_CODE(const char firePropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing a no-param property change (%016I64X, %016I64X):\r\n");
+DEBUG_CODE(const char firePropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing a no-param property change (%016llX, %016llX):\r\n");
 #endif
 
 #define FIRE_PROPERTY_CHANGE(method, FPprototype, eventFP) \
@@ -271,7 +271,7 @@ DEBUG_CODE(const char firePropertyChangeDebugString[] = "[INFO]: In AccessBridge
 #ifdef ACCESSBRIDGE_ARCH_LEGACY // JOBJECT64 is jobject (32 bit pointer)
 DEBUG_CODE(const char fireStringPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing a string property change (%p, %p, %ls, %ls):\r\n");
 #else // JOBJECT64 is jlong (64 bit)
-DEBUG_CODE(const char fireStringPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing a string property change (%016I64X, %016I64X, %ls, %ls):\r\n");
+DEBUG_CODE(const char fireStringPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing a string property change (%016llX, %016llX, %ls, %ls):\r\n");
 #endif
 
 #define FIRE_STRING_PROPERTY_CHANGE(method, FPprototype, eventFP, oldValue, newValue) \
@@ -300,7 +300,7 @@ DEBUG_CODE(const char fireStringPropertyChangeDebugString[] = "[INFO]: In Access
 #ifdef ACCESSBRIDGE_ARCH_LEGACY // JOBJECT64 is jobject (32 bit pointer)
 DEBUG_CODE(const char fireIntPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing an int property change (%p, %p, %d, %d):\r\n");
 #else // JOBJECT64 is jlong (64 bit)
-DEBUG_CODE(const char fireIntPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing an int property change (%016I64X, %016I64X, %d, %d):\r\n");
+DEBUG_CODE(const char fireIntPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing an int property change (%016llX, %016llX, %d, %d):\r\n");
 #endif
 
 #define FIRE_INT_PROPERTY_CHANGE(method, FPprototype, eventFP) \
@@ -329,7 +329,7 @@ DEBUG_CODE(const char fireIntPropertyChangeDebugString[] = "[INFO]: In AccessBri
 #ifdef ACCESSBRIDGE_ARCH_LEGACY // JOBJECT64 is jobject (32 bit pointer)
 DEBUG_CODE(const char fireACPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing an AC property change (%p, %p, %p, %p):\r\n");
 #else // JOBJECT64 is jlong (64 bit)
-DEBUG_CODE(const char fireACPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing an AC property change (%016I64X, %016I64X, %016I64X, %016I64X):\r\n");
+DEBUG_CODE(const char fireACPropertyChangeDebugString[] = "[INFO]: In AccessBridgeEventHandler::%s, Firing an AC property change (%016llX, %016llX, %016llX, %016llX):\r\n");
 #endif
 
 #define FIRE_AC_PROPERTY_CHANGE(method, FPprototype, eventFP) \