diff --git a/build.gradle b/build.gradle
index 9012d1e75..412ce914b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,6 @@ buildscript {
 	dependencies {
 		classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0"
 		classpath "org.xtext:xtext-gradle-plugin:4.0.0"
-		classpath "org.gradlex:extra-java-module-info:1.8"
 	}
 }
 
diff --git a/org.eclipse.lsp4j.debug/src/main/java/module-info.java b/org.eclipse.lsp4j.debug/src/main/java/module-info.java
deleted file mode 100644
index d17c2baad..000000000
--- a/org.eclipse.lsp4j.debug/src/main/java/module-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Thiago Henrique Hupner and others.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-module org.eclipse.lsp4j.debug {
-    requires com.google.gson;
-    requires org.eclipse.lsp4j.jsonrpc;
-    requires org.eclipse.lsp4j.jsonrpc.debug;
-
-    exports org.eclipse.lsp4j.debug;
-    exports org.eclipse.lsp4j.debug.adapters;
-    exports org.eclipse.lsp4j.debug.launch;
-    exports org.eclipse.lsp4j.debug.services;
-}
diff --git a/org.eclipse.lsp4j.generator/src/main/java/module-info.java b/org.eclipse.lsp4j.generator/src/main/java/module-info.java
deleted file mode 100644
index de5413c7d..000000000
--- a/org.eclipse.lsp4j.generator/src/main/java/module-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Thiago Henrique Hupner and others.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-module org.eclipse.lsp4j.generator {
-
-    requires com.google.common;
-    requires com.google.gson;
-    requires org.eclipse.xtend.lib.macro;
-    requires org.eclipse.lsp4j.jsonrpc;
-
-    exports org.eclipse.lsp4j.generator;
-}
diff --git a/org.eclipse.lsp4j.jsonrpc.debug/src/main/java/module-info.java b/org.eclipse.lsp4j.jsonrpc.debug/src/main/java/module-info.java
deleted file mode 100644
index 6966fb2b0..000000000
--- a/org.eclipse.lsp4j.jsonrpc.debug/src/main/java/module-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Thiago Henrique Hupner and others.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-module org.eclipse.lsp4j.jsonrpc.debug {
-    requires com.google.gson;
-    requires org.eclipse.lsp4j.jsonrpc;
-
-    exports org.eclipse.lsp4j.jsonrpc.debug;
-    exports org.eclipse.lsp4j.jsonrpc.debug.adapters;
-    exports org.eclipse.lsp4j.jsonrpc.debug.json;
-    exports org.eclipse.lsp4j.jsonrpc.debug.messages;
-}
diff --git a/org.eclipse.lsp4j.jsonrpc/src/main/java/module-info.java b/org.eclipse.lsp4j.jsonrpc/src/main/java/module-info.java
deleted file mode 100644
index bb7ba670f..000000000
--- a/org.eclipse.lsp4j.jsonrpc/src/main/java/module-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Thiago Henrique Hupner and others.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-module org.eclipse.lsp4j.jsonrpc {
-
-    requires java.logging;
-    requires com.google.gson;
-
-    exports org.eclipse.lsp4j.jsonrpc;
-    exports org.eclipse.lsp4j.jsonrpc.json;
-    exports org.eclipse.lsp4j.jsonrpc.json.adapters;
-    exports org.eclipse.lsp4j.jsonrpc.messages;
-    exports org.eclipse.lsp4j.jsonrpc.services;
-    exports org.eclipse.lsp4j.jsonrpc.util;
-    exports org.eclipse.lsp4j.jsonrpc.validation;
-}
diff --git a/org.eclipse.lsp4j.websocket.jakarta/src/main/java/module-info.java b/org.eclipse.lsp4j.websocket.jakarta/src/main/java/module-info.java
deleted file mode 100644
index e3f02e12b..000000000
--- a/org.eclipse.lsp4j.websocket.jakarta/src/main/java/module-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Thiago Henrique Hupner and others.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-module org.eclipse.lsp4j.websocket.jakarta {
-    requires jakarta.websocket;
-    requires java.logging;
-    requires org.eclipse.lsp4j.jsonrpc;
-
-    exports org.eclipse.lsp4j.websocket.jakarta;
-}
diff --git a/org.eclipse.lsp4j.websocket/build.gradle b/org.eclipse.lsp4j.websocket/build.gradle
index d863ef7e2..8875245bd 100644
--- a/org.eclipse.lsp4j.websocket/build.gradle
+++ b/org.eclipse.lsp4j.websocket/build.gradle
@@ -10,11 +10,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
  ******************************************************************************/
 
-
-plugins {
-    id("org.gradlex.extra-java-module-info")
-}
-
 ext.title = 'LSP4J WebSocket'
 description = 'WebSocket support for LSP4J (deprecated, please migrate to org.eclipse.lsp4j.websocket.jakarta)'
 
@@ -27,8 +22,3 @@ dependencies {
 jar.bundle.bnd(
 	'Import-Package': '*'
 )
-
-extraJavaModuleInfo {
-    automaticModule('javax.websocket:javax.websocket-api', 'javax.websocket.api')
-	automaticModule('org.hamcrest:hamcrest-core', 'hamcrest.core')
-}
diff --git a/org.eclipse.lsp4j.websocket/src/main/java/module-info.java b/org.eclipse.lsp4j.websocket/src/main/java/module-info.java
deleted file mode 100644
index 3aa2d9c08..000000000
--- a/org.eclipse.lsp4j.websocket/src/main/java/module-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Thiago Henrique Hupner and others.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-module org.eclipse.lsp4j.websocket {
-    requires javax.websocket.api;
-    requires java.logging;
-    requires org.eclipse.lsp4j.jsonrpc;
-
-    exports org.eclipse.lsp4j.websocket;
-}
diff --git a/org.eclipse.lsp4j/src/main/java/module-info.java b/org.eclipse.lsp4j/src/main/java/module-info.java
deleted file mode 100644
index db5928518..000000000
--- a/org.eclipse.lsp4j/src/main/java/module-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2024 Thiago Henrique Hupner and others.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- * 
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-module org.eclipse.lsp4j {
-
-    requires com.google.gson;
-    requires org.eclipse.lsp4j.jsonrpc;
-
-    exports org.eclipse.lsp4j;
-    exports org.eclipse.lsp4j.adapters;
-    exports org.eclipse.lsp4j.launch;
-    exports org.eclipse.lsp4j.services;
-    exports org.eclipse.lsp4j.util;
-}