diff -r c2abfb92ba69 -r b9bcea8bbe24 src/share/classes/com/sun/tools/javap/JavapFileManager.java
--- a/src/share/classes/com/sun/tools/javap/JavapFileManager.java	Fri Jun 06 15:17:35 2008 -0700
+++ b/src/share/classes/com/sun/tools/javap/JavapFileManager.java	Mon Jun 16 13:28:00 2008 -0700
@@ -32,9 +32,9 @@
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
 
+import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.JavacFileManager;
 
 /**
  *  javap's implementation of JavaFileManager.