diff --git a/bundles/org.eclipse.ui.comSunJnaSurrogate/.classpath b/bundles/org.eclipse.ui.comSunJnaSurrogate/.classpath
new file mode 100644
index 00000000000..375961e4d61
--- /dev/null
+++ b/bundles/org.eclipse.ui.comSunJnaSurrogate/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.ui.comSunJnaSurrogate/.project b/bundles/org.eclipse.ui.comSunJnaSurrogate/.project
new file mode 100644
index 00000000000..4b7a4e2475a
--- /dev/null
+++ b/bundles/org.eclipse.ui.comSunJnaSurrogate/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sun.jna.surrogate</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..23fa13b1705
--- /dev/null
+++ b/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=21
diff --git a/bundles/org.eclipse.ui.comSunJnaSurrogate/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.comSunJnaSurrogate/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..9ece6d89882
--- /dev/null
+++ b/bundles/org.eclipse.ui.comSunJnaSurrogate/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Surrogate
+Bundle-SymbolicName: com.sun.jna.surrogate
+Bundle-Version: 1.0.0.qualifier
+Export-Package: com.sun.jna;version="5.8.0",
+ com.sun.jna.platform;version="5.10.0",
+ com.sun.jna.platform.win32;version="5.10.0"
+Bundle-Vendor: SUN
+Automatic-Module-Name: com.sun.jna.surrogate
+Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/bundles/org.eclipse.ui.comSunJnaSurrogate/build.properties b/bundles/org.eclipse.ui.comSunJnaSurrogate/build.properties
new file mode 100644
index 00000000000..34d2e4d2dad
--- /dev/null
+++ b/bundles/org.eclipse.ui.comSunJnaSurrogate/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF
index a53634e3b88..13ccbc56632 100644
--- a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.urischeme;singleton:=true
-Bundle-Version: 1.3.500.qualifier
+Bundle-Version: 1.3.600.qualifier
 Automatic-Module-Name: org.eclipse.urischeme
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.equinox.registry;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
- com.sun.jna;bundle-version="[5.8.0,6.0.0)",
- com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)"
+ org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)"
 Export-Package: org.eclipse.urischeme;x-friends:="org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.examples.uriSchemeHandler,org.eclipse.ui.browser,org.eclipse.ui.ide.application"
+Import-Package: com.sun.jna;version="[5.8.0,6.0.0)",
+ com.sun.jna.platform;version="[5.10.0,6.0.0)",
+ com.sun.jna.platform.win32;version="[5.10.0,6.0.0)"
 Bundle-Vendor: %Plugin.Providername
 Bundle-Localization: plugin