--- old/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java	2016-01-08 18:52:04.237395274 +0000
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java	2016-01-08 18:52:04.097398255 +0000
@@ -47,11 +47,11 @@
 import java.util.*;
 import javax.swing.LookAndFeel;
 import javax.swing.UIDefaults;
+import jdk.internal.perf.PerformanceLogger;
 import sun.awt.*;
 import sun.awt.datatransfer.DataTransferer;
 import sun.font.FontConfigManager;
 import sun.java2d.SunGraphicsEnvironment;
-import sun.misc.*;
 import sun.awt.util.ThreadGroupUtils;
 import sun.print.PrintJob2D;
 import sun.security.action.GetPropertyAction;
@@ -282,7 +282,7 @@
                 }
             };
             String name = "XToolkt-Shutdown-Thread";
-            Thread shutdownThread = new ManagedLocalsThread(
+            Thread shutdownThread = new sun.misc.ManagedLocalsThread(
                     ThreadGroupUtils.getRootThreadGroup(), r, name);
             shutdownThread.setContextClassLoader(null);
             Runtime.getRuntime().addShutdownHook(shutdownThread);
@@ -330,7 +330,7 @@
 
             toolkitThread = AccessController.doPrivileged((PrivilegedAction<Thread>) () -> {
                 String name = "AWT-XAWT";
-                Thread thread = new ManagedLocalsThread(
+                Thread thread = new sun.misc.ManagedLocalsThread(
                         ThreadGroupUtils.getRootThreadGroup(), this, name);
                 thread.setContextClassLoader(null);
                 thread.setPriority(Thread.NORM_PRIORITY + 1);