diff --git a/jdk/make/CompileLaunchers.gmk b/jdk/make/CompileLaunchers.gmk
index 8179eb849d1..f831208e162 100644
--- a/jdk/make/CompileLaunchers.gmk
+++ b/jdk/make/CompileLaunchers.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -679,7 +679,10 @@ ifndef OPENJDK
         PROGRAM := jabswitch, \
         DEBUG_SYMBOLS := true, \
         VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc, \
-        RC_FLAGS := $(RC_FLAGS), \
+        RC_FLAGS := $(RC_FLAGS) \
+            -D "JDK_FNAME=jabswitch.exe" \
+            -D "JDK_INTERNAL_NAME=jabswitch" \
+            -D "JDK_FTYPE=0x01L", \
         MANIFEST := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest))
 
     BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
diff --git a/jdk/make/lib/PlatformLibraries.gmk b/jdk/make/lib/PlatformLibraries.gmk
index a70adf87027..336e4b1b3e4 100644
--- a/jdk/make/lib/PlatformLibraries.gmk
+++ b/jdk/make/lib/PlatformLibraries.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -160,7 +160,10 @@ ifndef OPENJDK
               -subsystem:windows -machine:$2 \
               -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \
           VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
-          RC_FLAGS := $(RC_FLAGS), \
+          RC_FLAGS := $(RC_FLAGS) \
+              -D "JDK_FNAME=JAWTAccessBridge$1.dll" \
+              -D "JDK_INTERNAL_NAME=JAWTAccessBridge$1" \
+              -D "JDK_FTYPE=0x02L", \
           OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
           DEBUG_SYMBOLS := true)
 
@@ -183,7 +186,10 @@ ifndef OPENJDK
               -subsystem:windows -machine:$2 \
               -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \
           VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
-          RC_FLAGS := $(RC_FLAGS), \
+          RC_FLAGS := $(RC_FLAGS) \
+              -D "JDK_FNAME=JavaAccessBridge$1.dll" \
+              -D "JDK_INTERNAL_NAME=JavaAccessBridge$1" \
+              -D "JDK_FTYPE=0x02L", \
           OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
           DEBUG_SYMBOLS := true)
 
@@ -205,7 +211,10 @@ ifndef OPENJDK
               -subsystem:windows -machine:$2 \
               -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF, \
           VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
-          RC_FLAGS := $(RC_FLAGS), \
+          RC_FLAGS := $(RC_FLAGS) \
+              -D "JDK_FNAME=WindowsAccessBridge$1.dll" \
+              -D "JDK_INTERNAL_NAME=WindowsAccessBridge$1" \
+              -D "JDK_FTYPE=0x02L", \
           OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
           DEBUG_SYMBOLS := true)