--- a/stx_libjava.st	Wed Apr 17 19:49:55 2013 +0200
+++ b/stx_libjava.st	Wed Apr 17 21:39:03 2013 +0200
@@ -162,15 +162,14 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPCompositeParserTest - superclass of JavaParserIITests "
-        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaClassReloadingTests "
-        #'stx:libbasic'    "Exception - superclass of JavaError "
-        #'stx:libbasic2'    "SignedLongIntegerArray - extended "
+        #'stx:goodies/petitparser'    "PPParser - superclass of JavaParser "
+        #'stx:libbasic'    "ArithmeticValue - superclass of JavaByte "
+        #'stx:libbasic2'    "BooleanArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
-        #'stx:libcomp'    "ParseNode - superclass of JavaTypeDeclarationNode "
-        #'stx:libtool'    "Tools::CodeViewService - superclass of JavaCompilerProblemService "
-        #'stx:libview'    "GraphicsMedium - superclass of JavaListInspectorView "
-        #'stx:libview2'    "Model - superclass of JavaSettingsApplication "
+        #'stx:libcomp'    "ParseNode - superclass of JavaImportDeclarationNode "
+        #'stx:libtool'    "AbstractSettingsApplication - superclass of JavaSettingsApplication "
+        #'stx:libview'    "GraphicsContext - superclass of JavaTopView "
+        #'stx:libview2'    "Model - superclass of JavaCodeLibraryEditor "
         #'stx:libwidg2'    "HierarchicalItem - superclass of JavaCodeBundleEditor::Item "
     )
 !
@@ -208,10 +207,11 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
+        #'stx:goodies/sunit'    "TestSuite - referenced by JavaTestsLoader class>>buildSuiteFrom: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libjava/experiments'    "JavaByteCodeInterpreter - referenced by JavaMethod>>interpretWithReceiver:arguments: "
-        #'stx:libjava/tools'    "JavaSyntaxHighlighter::Builder - referenced by JavaSyntaxHighlighter>>format:kind:in: "
-        #'stx:libwidg'    "SelectionInList - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WListPeer_create: "
+        #'stx:libjava/experiments'    "JavaCompiler - referenced by JavaLanguage>>compilerClass "
+        #'stx:libjava/tools'    "JavaCodeLibraryEditor - referenced by JavaCodeBundleEditor>>doBrowseFiles "
+        #'stx:libwidg'    "Label - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WLabelPeer_create: "
     )
 !
 
@@ -372,6 +372,7 @@
         (JavaFieldRefTests autoload)
         JavaFinalizationRegistry
         (JavaFreshlyInitializedResource autoload)
+        (JavaInitializedResource autoload)
         (JavaInterfaceMethodRefTests autoload)
         (JavaJUnitTests autoload)
         JavaLanguage
@@ -401,6 +402,7 @@
         JavaRef2
         (JavaRefMock autoload)
         (JavaRefsAndConstantPoolTestCase autoload)
+        JavaRelease
         JavaResolver
         (JavaRuntimeConstantPoolTests autoload)
         JavaShort
@@ -416,7 +418,6 @@
         JavaUnresolvedConstant
         JavaUtilities
         JavaVMData
-        JavaRelease
         JavaView
         JavaZipSupport
         PPJavaNode
@@ -449,7 +450,6 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
-        (JavaInitializedResource autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer