Index: /trunk/src/org/openstreetmap/josm/data/Version.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Version.java	(revision 12626)
+++ /trunk/src/org/openstreetmap/josm/data/Version.java	(revision 12627)
@@ -104,5 +104,5 @@
      */
     public void init() {
-        try (InputStream stream = Main.class.getResourceAsStream("/REVISION")) {
+        try (InputStream stream = Version.class.getResourceAsStream("/REVISION")) {
             if (stream == null) {
                 Logging.warn(tr("The revision file ''/REVISION'' is missing."));
Index: /trunk/src/org/openstreetmap/josm/plugins/Plugin.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/Plugin.java	(revision 12626)
+++ /trunk/src/org/openstreetmap/josm/plugins/Plugin.java	(revision 12627)
@@ -147,5 +147,5 @@
         final URL pluginJarUrl = Utils.fileToURL(pluginJar);
         return AccessController.doPrivileged((PrivilegedAction<ClassLoader>)
-                () -> new URLClassLoader(new URL[] {pluginJarUrl}, Main.class.getClassLoader()));
+                () -> new URLClassLoader(new URL[] {pluginJarUrl}, Plugin.class.getClassLoader()));
     }
 }
Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 12626)
+++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 12627)
@@ -734,5 +734,5 @@
         if (joinedPluginResourceCL == null) {
             joinedPluginResourceCL = AccessController.doPrivileged((PrivilegedAction<DynamicURLClassLoader>)
-                    () -> new DynamicURLClassLoader(new URL[0], Main.class.getClassLoader()));
+                    () -> new DynamicURLClassLoader(new URL[0], PluginHandler.class.getClassLoader()));
             sources.add(0, joinedPluginResourceCL);
         }
@@ -831,5 +831,5 @@
                     () -> new PluginClassLoader(
                         info.libraries.toArray(new URL[0]),
-                        Main.class.getClassLoader(),
+                        PluginHandler.class.getClassLoader(),
                         null));
                 classLoaders.put(info, cl);
Index: /trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 12626)
+++ /trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 12627)
@@ -28,5 +28,4 @@
 
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter.TranslationAdapter;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
@@ -363,5 +362,5 @@
 
     private static URL getTranslationFile(String lang) {
-        return Main.class.getResource("/data/"+lang.replace('@', '-')+".lang");
+        return I18n.class.getResource("/data/"+lang.replace('@', '-')+".lang");
     }
 
Index: /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java	(revision 12626)
+++ /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java	(revision 12627)
@@ -10,5 +10,4 @@
 import javax.script.ScriptException;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.CachedFile;
 
@@ -43,5 +42,5 @@
         try (CachedFile file = new CachedFile("resource://data/overpass-wizard.js");
              Reader reader = file.getContentReader()) {
-            engine.eval("var console = {error: " + Main.class.getCanonicalName() + ".warn};");
+            engine.eval("var console = {error: " + Logging.class.getCanonicalName() + ".warn};");
             engine.eval("var global = {};");
             engine.eval(reader);