--- a/stx_libjava.st	Tue Nov 19 00:46:15 2013 +0000
+++ b/stx_libjava.st	Tue Nov 19 10:01:25 2013 +0000
@@ -160,7 +160,6 @@
      (the browser has a menu function for that)"
 
     ^ #(
-        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaAntProjectResource "
         #'stx:libbasic'    "AbstractNumberVector - extended "
         #'stx:libbasic2'    "BitArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
@@ -177,6 +176,7 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
+        #'stx:goodies/sunit'    "TestSuite - referenced by JavaTestsLoader class>>buildSuiteFrom: "
         #'stx:libcomp'    "BlockNode - referenced by JavaNativeMethod>>numberOfArgs: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
@@ -193,10 +193,8 @@
      for those, redefine requiredPrerequisites"
 
     ^ #(
-        #'stx:libjava/libs'
+        #'stx:libjava/experiments'
         #'stx:libjava/tools'
-        #'stx:libjava/experiments'
-        #'stx:libjava/mauve'
     )
 ! !
 
@@ -332,6 +330,7 @@
         (JavaClassRefTests autoload)
         JavaClassReloader
         JavaCodeLibraryOrBundle
+        JavaCompilerForSmalltalkExtensionsOnly
         #'JavaCompiler_Eclipse'
         JavaConstantPool
         JavaConstants
@@ -345,6 +344,7 @@
         (JavaFieldRefTests autoload)
         JavaFinalizationRegistry
         (JavaFreshlyInitializedResource autoload)
+        (JavaInitializedResource autoload)
         JavaInnerClasses
         (JavaInterfaceMethodRefTests autoload)
         (JavaJUnitTests autoload)
@@ -384,6 +384,7 @@
         JavaSourceFileWriter
         (JavaTestCaseProxy autoload)
         JavaTestsLoader
+        (JavaTestsResource autoload)
         JavaTopView
         (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
@@ -397,6 +398,7 @@
         ProxyMethodNode
         SmalltalkAppletContext
         SmalltalkAppletStub
+        (TestletTestCaseProxy autoload)
         #'stx_libjava'
         GroovyMetaclass
         Java
@@ -420,7 +422,6 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
-        (JavaInitializedResource autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer
@@ -428,7 +429,6 @@
         #'JavaNativeMethodImpl_OpenJDK6'
         JavaRelease
         JavaStringRef2
-        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnresolvedClassConstant
         JavaUnresolvedStringConstant
@@ -437,7 +437,6 @@
         ProxyMethodGuardNode
         ProxyMethodInvocationNode
         ProxyMethodJavaFieldAccessor
-        (TestletTestCaseProxy autoload)
         JavaByteCodePreresolver
         JavaClass
         JavaClassPathBundle