--- old/make/lib/Lib-jdk.jdi.gmk	2016-02-26 03:38:01.615778171 +0100
+++ new/make/lib/Lib-jdk.jdi.gmk	2016-02-26 03:38:01.427770330 +0100
@@ -47,6 +47,7 @@
       CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
           $(LIBDT_SHMEM_CPPFLAGS), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
+      LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
       LIBS := $(JDKLIB_LIBS), \
       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       RC_FLAGS := $(RC_FLAGS) \
--- old/make/lib/Lib-jdk.jdwp.agent.gmk	2016-02-26 03:38:02.143800193 +0100
+++ new/make/lib/Lib-jdk.jdwp.agent.gmk	2016-02-26 03:38:01.955792352 +0100
@@ -46,6 +46,7 @@
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
+    LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
     LIBS_linux := -lpthread, \
     LIBS_solaris := -lnsl -lsocket -lc, \
     LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
--- old/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c	2016-02-26 03:38:02.675822382 +0100
+++ new/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c	2016-02-26 03:38:02.475814041 +0100
@@ -338,7 +338,7 @@
     return JDWPTRANSPORT_ERROR_NONE;
 }
 
-JNIEXPORT jint JNICALL
+jint JNICALL
 jdwpTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
                      jint version, jdwpTransportEnv** result)
 {
--- old/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c	2016-02-26 03:38:03.207844571 +0100
+++ new/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c	2016-02-26 03:38:03.011836396 +0100
@@ -784,7 +784,7 @@
     return JDWPTRANSPORT_ERROR_NONE;
 }
 
-JNIEXPORT jint JNICALL
+jint JNICALL
 jdwpTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
                      jint version, jdwpTransportEnv** result)
 {