--- old/src/java.base/share/classes/module-info.java	2018-03-22 12:51:54.122153810 -0700
+++ new/src/java.base/share/classes/module-info.java	2018-03-22 12:51:53.918153813 -0700
@@ -186,7 +186,6 @@
         jdk.jartool,
         jdk.jlink;
     exports jdk.internal.perf to
-        java.desktop,
         java.management,
         jdk.management.agent,
         jdk.internal.jvmstat;
@@ -233,7 +232,6 @@
         jdk.sctp,
         jdk.unsupported;
     exports sun.nio.cs to
-        java.desktop,
         jdk.charsets;
     exports sun.nio.fs to
         jdk.unsupported;
--- old/src/java.base/unix/classes/module-info.java.extra	2018-03-22 12:51:54.514153803 -0700
+++ new/src/java.base/unix/classes/module-info.java.extra	2018-03-22 12:51:54.334153806 -0700
@@ -23,3 +23,4 @@
  * questions.
  */
 
+exports sun.nio.cs to java.desktop;
--- old/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java	2018-03-22 12:51:54.894153797 -0700
+++ new/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java	2018-03-22 12:51:54.710153800 -0700
@@ -133,10 +133,6 @@
         static final PerfCounter zfot  = newPerfCounter("sun.zip.zipFile.openTime");
     }
 
-    static class WindowsClientCounters {
-        static final PerfCounter d3dAvailable = newConstantPerfCounter("sun.java2d.d3d.available");
-    }
-
     /**
      * Number of findClass calls
      */
@@ -182,10 +178,4 @@
         return CoreCounters.zfot;
     }
 
-    /**
-     * D3D graphic pipeline available
-     */
-    public static PerfCounter getD3DAvailable() {
-        return WindowsClientCounters.d3dAvailable;
-    }
 }
--- old/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java	2018-03-22 12:51:55.278153791 -0700
+++ new/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java	2018-03-22 12:51:55.094153794 -0700
@@ -38,7 +38,6 @@
 import java.awt.peer.WindowPeer;
 import java.util.ArrayList;
 
-import jdk.internal.perf.PerfCounter;
 import sun.awt.AWTAccessor;
 import sun.awt.AWTAccessor.ComponentAccessor;
 import sun.awt.Win32GraphicsDevice;
@@ -70,9 +69,6 @@
         if (d3dAvailable) {
             // we don't use pixel formats for the d3d pipeline
             pfDisabled = true;
-            PerfCounter.getD3DAvailable().set(1);
-        } else {
-            PerfCounter.getD3DAvailable().set(0);
         }
     }