diff --git a/api/js/egw_action/egw_action_popup.js b/api/js/egw_action/egw_action_popup.js
index 7ab9f6635f..3bbf29537b 100644
--- a/api/js/egw_action/egw_action_popup.js
+++ b/api/js/egw_action/egw_action_popup.js
@@ -19,6 +19,7 @@ import {egwAction, egwActionImplementation, egwActionObject} from './egw_action.
 import {egwFnct} from './egw_action_common.js';
 import {egwMenu, _egw_active_menu} from "./egw_menu.js";
 import {EGW_KEY_ENTER, EGW_KEY_MENU} from "./egw_action_constants.js";
+import "../jquery/jquery-tap-and-hold/jquery.tapandhold.js";
 
 if (typeof window._egwActionClasses == "undefined")
 	window._egwActionClasses = {};
diff --git a/api/js/etemplate/et2_extension_nextmatch_controller.ts b/api/js/etemplate/et2_extension_nextmatch_controller.ts
index 4f2552d282..9f089abeb4 100644
--- a/api/js/etemplate/et2_extension_nextmatch_controller.ts
+++ b/api/js/etemplate/et2_extension_nextmatch_controller.ts
@@ -755,7 +755,7 @@ export class et2_nextmatch_controller extends et2_dataview_controller implements
 		if(!this._widget) return;
 
 		// inform mobile framework about nm selections, need to update status of header objects on selection
-		if (egwIsMobile()) framework.nm_onselect_ctrl(this._widget, action, senders);
+		if (egwIsMobile()) window.framework.nm_onselect_ctrl(this._widget, action, senders);
 
 		this._widget.onselect.call(this._widget, action,senders);
 	}
diff --git a/api/js/etemplate/et2_widget_split.ts b/api/js/etemplate/et2_widget_split.ts
index 7ba8dbcb5d..aa52aca726 100644
--- a/api/js/etemplate/et2_widget_split.ts
+++ b/api/js/etemplate/et2_widget_split.ts
@@ -21,6 +21,7 @@ import {ClassWithAttributes} from "./et2_core_inheritance";
 import {et2_IPrint, et2_IResizeable} from "./et2_core_interfaces";
 import {et2_no_init} from "./et2_core_common";
 import {et2_dynheight} from "./et2_widget_dynheight";
+import "../jquery/splitter.js";
 
 /**
 * A container widget that accepts 2 children, and puts a resize bar between them.
diff --git a/api/js/etemplate/expose.ts b/api/js/etemplate/expose.ts
index b0434aa412..957edb81d5 100644
--- a/api/js/etemplate/expose.ts
+++ b/api/js/etemplate/expose.ts
@@ -21,6 +21,8 @@ import {et2_dialog} from "./et2_widget_dialog";
 import {egw, egw_get_file_editor_prefered_mimes} from "../jsapi/egw_global";
 import {et2_nextmatch} from "./et2_extension_nextmatch";
 import {ET2_DATAVIEW_STEPSIZE} from "./et2_dataview_controller";
+import "../jquery/blueimp/js/blueimp-gallery.min.js";
+import "../../../vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js";
 
 type Constructor<T = {}> = new (...args: any[]) => T;
 
diff --git a/api/js/framework/fw_ui.js b/api/js/framework/fw_ui.js
index a77b3693a2..5218112f3f 100644
--- a/api/js/framework/fw_ui.js
+++ b/api/js/framework/fw_ui.js
@@ -16,6 +16,7 @@
 import "../../../vendor/bower-asset/jquery/dist/jquery.min.js";
 import "../jquery/jquery.noconflict.js";
 import "../../../vendor/bower-asset/jquery-ui/jquery-ui.js";
+import "../jquery/mousewheel/mousewheel.js";
 import '../jsapi/egw_inheritance.js';
 import {EGW_KEY_ENTER, EGW_KEY_SPACE} from '../egw_action/egw_action_constants.js';
 
diff --git a/api/js/jquery/jquery.noconflict.js b/api/js/jquery/jquery.noconflict.js
index e488aca3d9..e13c091795 100644
--- a/api/js/jquery/jquery.noconflict.js
+++ b/api/js/jquery/jquery.noconflict.js
@@ -8,17 +8,4 @@
  * @author Ralf Becker <rb@egroupware.org>
  */
 
-/*egw:uses
-	/vendor/bower-asset/jquery/dist/jquery.js;
-	/vendor/bower-asset/jquery-ui/jquery-ui.js;
-	/api/js/jquery/chosen/chosen.jquery.js;
-	/api/js/jquery/jquery-tab-and-hold/jquery.tabandhold.js;
-	/api/js/jquery/mousewheel/mousewheel.js;
-	/api/js/jquery/jquery-ui-timepicker-addon.js;
-	/vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js;
-	/vendor/egroupware/magicsuggest/magicsuggest.js;
-	/api/js/jquery/splitter.js;
-	/api/js/jquery/blueimp/js/blueimp-gallery.min.js;
-	/api/js/Resumable/resumable.js;
-*/
 jQuery.noConflict();
\ No newline at end of file
diff --git a/api/js/jsapi/egw.js b/api/js/jsapi/egw.js
index 74d12beb85..23c36a4778 100644
--- a/api/js/jsapi/egw.js
+++ b/api/js/jsapi/egw.js
@@ -78,7 +78,7 @@ window.app = {classes: {}};
 	window.egw_appName = egw_script.getAttribute('data-app');
 
 	// split includes in legacy js and modules
-	const legacy_js_regexp = /\/dhtmlx/;
+	const legacy_js_regexp = /\/dhtmlx|jquery-ui/;
 
 	// check if egw object was injected by window open
 	if (typeof window.egw == 'undefined')
diff --git a/api/src/Framework/Bundle.php b/api/src/Framework/Bundle.php
index 7436310cb0..2131bfe80d 100644
--- a/api/src/Framework/Bundle.php
+++ b/api/src/Framework/Bundle.php
@@ -123,6 +123,10 @@ class Bundle
 					{
 						$to_include[$file] = $path.'?'.$mod.($query ? '&'.$query : '');
 					}
+					elseif (in_array($file, ['/api/js/jsapi.min.js', '/vendor/bower-asset/jquery/dist/jquery.min.js','/vendor/bower-asset/jquery/dist/jquery.js']))
+					{
+						error_log(function_backtrace());	// no NOT include
+					}
 					else
 					{
 						$to_include[$file] = $path.($query ? '?'.$query : '');