diff --git a/addons/account/static/src/js/move_line_quickadd.js b/addons/account/static/src/js/move_line_quickadd.js
index 80b70fe03e0..6d437826a6a 100644
--- a/addons/account/static/src/js/move_line_quickadd.js
+++ b/addons/account/static/src/js/move_line_quickadd.js
@@ -1,4 +1,4 @@
-odoo.define('account.move_line_quickadd', ['web.core', 'web.data', 'web.ListView', 'web.Model'], function (require) {
+odoo.define('account.move_line_quickadd', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/account/static/src/js/tour_bank_statement_reconciliation.js b/addons/account/static/src/js/tour_bank_statement_reconciliation.js
index 8c6cf843f5b..9c9fc2abe67 100644
--- a/addons/account/static/src/js/tour_bank_statement_reconciliation.js
+++ b/addons/account/static/src/js/tour_bank_statement_reconciliation.js
@@ -1,4 +1,4 @@
-odoo.define('account.tour_bank_statement_reconciliation', ['web.core', 'web.Tour'], function(require) {
+odoo.define('account.tour_bank_statement_reconciliation', function(require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/account/static/src/js/widgets.js b/addons/account/static/src/js/widgets.js
index e93598b78b6..054735cb60d 100644
--- a/addons/account/static/src/js/widgets.js
+++ b/addons/account/static/src/js/widgets.js
@@ -1,4 +1,4 @@
-odoo.define('account.widgets', ['web.ActionManager', 'web.core', 'web.CrashManager', 'web.data', 'web.Dialog', 'web.formats', 'web.FormView', 'web.ListView', 'web.Model', 'web.pyeval', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('account.widgets', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');
diff --git a/addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js b/addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js
index 31972f37a2f..2c2219823a7 100644
--- a/addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js
+++ b/addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js
@@ -1,4 +1,4 @@
-odoo.define('account_analytic_plans.custom', ['account.widgets', 'web.core'], function (require) {
+odoo.define('account_analytic_plans.custom', function (require) {
 "use strict";
 
 var widgets = require('account.widgets');
diff --git a/addons/barcodes/static/src/js/barcode_parser.js b/addons/barcodes/static/src/js/barcode_parser.js
index e208257cd11..e1703ae62b4 100644
--- a/addons/barcodes/static/src/js/barcode_parser.js
+++ b/addons/barcodes/static/src/js/barcode_parser.js
@@ -1,4 +1,4 @@
-odoo.define('barcodes.BarcodeParser', ['web.Class', 'web.Model'], function (require) {
+odoo.define('barcodes.BarcodeParser', function (require) {
 "use strict";
 
 var Class = require('web.Class');
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 1bd4fa4cfd9..8843cde167c 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -1,4 +1,4 @@
-odoo.define('base_import.import', ['web.core', 'web.ListView', 'web.Model', 'web.session', 'web.Widget'], function (require) {
+odoo.define('base_import.import', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index dbae493af8f..2730e1f9577 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -1,4 +1,4 @@
-odoo.define('board.dashboard', ['web.ActionManager', 'web.core', 'web.data', 'web.Dialog', 'web.FavoriteMenu', 'web.form_common', 'web.Model', 'web.pyeval', 'web.ViewManager'], function (require) {
+odoo.define('board.dashboard', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');
diff --git a/addons/bus/static/src/js/bus.js b/addons/bus/static/src/js/bus.js
index 90dfa97618e..b0756132012 100644
--- a/addons/bus/static/src/js/bus.js
+++ b/addons/bus/static/src/js/bus.js
@@ -1,4 +1,4 @@
-odoo.define('bus.bus', ['web.session', 'web.Widget'], function (require) {
+odoo.define('bus.bus', function (require) {
 
 var session = require('web.session');
 var Widget = require('web.Widget');
diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index b4dc5b834e2..f0500f2ac80 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -1,4 +1,4 @@
-odoo.define('base_calendar.base_calendar', ['web.core', 'web.data', 'web.form_common', 'web.Model', 'web.WebClient', 'web_calendar.CalendarView', 'web_calendar.widgets'], function (require) {
+odoo.define('base_calendar.base_calendar', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js
index c3b47ee7380..9448a93adb9 100644
--- a/addons/document/static/src/js/document.js
+++ b/addons/document/static/src/js/document.js
@@ -1,4 +1,4 @@
-odoo.define('document.document', ['web.core', 'web.Sidebar'], function(require) {
+odoo.define('document.document', function(require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 5b0b8a50a83..66e88b82bfe 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -1,4 +1,4 @@
-odoo.define('edi.EdiImport', ['web.core', 'web.Dialog', 'web.framework', 'web.Widget'], function (require) {
+odoo.define('edi.EdiImport', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 3d180909235..fb70b7e3d61 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -1,4 +1,4 @@
-odoo.define('gamification.gamification', ['mail.mail', 'web.core', 'web.form_common', 'web.Model', 'web.session', 'web.Widget'], function(require) {
+odoo.define('gamification.gamification', function(require) {
 "use strict";
 
 var mail = require('mail.mail');
diff --git a/addons/google_calendar/static/src/js/calendar_sync.js b/addons/google_calendar/static/src/js/calendar_sync.js
index a576692fa16..711fc124f32 100644
--- a/addons/google_calendar/static/src/js/calendar_sync.js
+++ b/addons/google_calendar/static/src/js/calendar_sync.js
@@ -1,4 +1,4 @@
-odoo.define('google_calendar.google_calendar', ['web.core', 'web.framework', 'web.pyeval', 'web_calendar.CalendarView'], function (require) {
+odoo.define('google_calendar.google_calendar', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index 314c2299d48..87de791b480 100644
--- a/addons/google_drive/static/src/js/gdrive.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -1,4 +1,4 @@
-odoo.define('google_drive.google_drive', ['web.data', 'web.Model', 'web.Sidebar'], function (require) {
+odoo.define('google_drive.google_drive', function (require) {
 "use strict";
 
 var data = require('web.data');
diff --git a/addons/google_spreadsheet/static/src/js/search.js b/addons/google_spreadsheet/static/src/js/search.js
index fbdb669ad7b..2736088fd8c 100644
--- a/addons/google_spreadsheet/static/src/js/search.js
+++ b/addons/google_spreadsheet/static/src/js/search.js
@@ -1,4 +1,4 @@
-odoo.define('google_spreadsheet.google.spreadsheet', ['web.core', 'web.data', 'web.FavoriteMenu', 'web.FormView', 'web.pyeval'], function (require) {
+odoo.define('google_spreadsheet.google.spreadsheet', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/hr/static/src/js/hr.js b/addons/hr/static/src/js/hr.js
index 80b978e7fc9..60c5af11688 100644
--- a/addons/hr/static/src/js/hr.js
+++ b/addons/hr/static/src/js/hr.js
@@ -1,4 +1,4 @@
-odoo.define('hr.hr', ['web_kanban.common'], function(require) {
+odoo.define('hr.hr', function(require) {
 "use strict";
 
 var common = require('web_kanban.common');
diff --git a/addons/hr/static/src/js/suggestions.js b/addons/hr/static/src/js/suggestions.js
index 94df0a4ad7b..45d42db313a 100644
--- a/addons/hr/static/src/js/suggestions.js
+++ b/addons/hr/static/src/js/suggestions.js
@@ -1,4 +1,4 @@
-odoo.define('hr.suggestions', ['mail.mail', 'web.core', 'web.data', 'web.Widget'], function (require) {
+odoo.define('hr.suggestions', function (require) {
 "use strict";
 
 var mail = require('mail.mail');
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 783728b7d79..80859b76bd5 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -1,4 +1,4 @@
-odoo.define('hr_attendance.hr_attendance', ['web.core', 'web.data', 'web.formats', 'web.Model', 'web.SystrayMenu', 'web.time', 'web.Widget'], function(require) {
+odoo.define('hr_attendance.hr_attendance', function(require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/hr_gamification/static/src/js/gamification.js b/addons/hr_gamification/static/src/js/gamification.js
index ad065ecfa23..765acb257e4 100644
--- a/addons/hr_gamification/static/src/js/gamification.js
+++ b/addons/hr_gamification/static/src/js/gamification.js
@@ -1,4 +1,4 @@
-odoo.define('hr_gamification.hr_gamification', ['web_kanban.common'], function(require) {
+odoo.define('hr_gamification.hr_gamification', function(require) {
 "use strict";
 
 var common = require('web_kanban.common');
diff --git a/addons/hr_recruitment/static/src/js/job_position.js b/addons/hr_recruitment/static/src/js/job_position.js
index 55361fdef2a..9361c66cf7d 100644
--- a/addons/hr_recruitment/static/src/js/job_position.js
+++ b/addons/hr_recruitment/static/src/js/job_position.js
@@ -1,4 +1,4 @@
-odoo.define('hr_recruitment.hr_recruitment', ['web_kanban.common'], function(require) {
+odoo.define('hr_recruitment.hr_recruitment', function(require) {
 "use strict";
 
 var common = require('web_kanban.common');
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index ef3eb5c4f0a..805333795e4 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -1,4 +1,4 @@
-odoo.define('hr_timesheet_sheet.sheet', ['web.core', 'web.data', 'web.form_common', 'web.formats', 'web.Model', 'web.time', 'web.utils'], function (require) {
+odoo.define('hr_timesheet_sheet.sheet', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/im_chat/static/src/js/im_chat.js b/addons/im_chat/static/src/js/im_chat.js
index 7b4c941fdd7..2017f5c3582 100644
--- a/addons/im_chat/static/src/js/im_chat.js
+++ b/addons/im_chat/static/src/js/im_chat.js
@@ -1,4 +1,4 @@
-odoo.define('im_chat.im_chat', ['bus.bus', 'web.core', 'web.data', 'web.Model', 'web.session', 'web.SystrayMenu', 'web.time', 'web.utils', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('im_chat.im_chat', function (require) {
 "use strict";
 
 // to do: make this work in website
diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js
index d032eefefd6..c5fd6cc75bb 100644
--- a/addons/im_livechat/static/src/js/im_livechat.js
+++ b/addons/im_livechat/static/src/js/im_livechat.js
@@ -1,4 +1,4 @@
-odoo.define('im_livechat.im_livechat', ['bus.bus', 'im_chat.im_chat', 'web.core', 'web.session', 'web.utils', 'web.time', 'web.Widget'], function (require) {
+odoo.define('im_livechat.im_livechat', function (require) {
 "use strict";
 
 var bus = require('bus.bus');
diff --git a/addons/im_livechat/views/im_livechat.xml b/addons/im_livechat/views/im_livechat.xml
index 9f2b39d9039..6f993cfef64 100644
--- a/addons/im_livechat/views/im_livechat.xml
+++ b/addons/im_livechat/views/im_livechat.xml
@@ -118,7 +118,7 @@
 
         <!-- the js code to initialize the LiveSupport object -->
         <template id="loader" name="Javascript initializing the LiveSupport">
-            odoo.define('im_livechat.livesupport', ['im_livechat.im_livechat'], function (require) {
+            odoo.define('im_livechat.livesupport', function (require) {
                 var im_livechat = require('im_livechat.im_livechat');
                 window.livesupport = new im_livechat.LiveSupport(
                     "<t t-esc="url"/>",
diff --git a/addons/im_odoo_support/static/src/js/im_odoo_support.js b/addons/im_odoo_support/static/src/js/im_odoo_support.js
index f17f7f2dc5e..4945ba49ca2 100644
--- a/addons/im_odoo_support/static/src/js/im_odoo_support.js
+++ b/addons/im_odoo_support/static/src/js/im_odoo_support.js
@@ -1,4 +1,4 @@
-odoo.define('im_odoo_support.OdooSupport', ['im_livechat.im_livechat', 'web.core', 'web.UserMenu', 'web.utils', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('im_odoo_support.OdooSupport', function (require) {
 "use strict";
 
 var im_livechat = require('im_livechat.im_livechat');
@@ -117,7 +117,7 @@ return OdooSupport;
 
 });
 
-odoo.define('im_odoo_support.config_im_chat', ['im_chat.im_chat', 'web.core'], function (require) {
+odoo.define('im_odoo_support.config_im_chat', function (require) {
 "use strict";
 
 var im_chat = require('im_chat.im_chat');
diff --git a/addons/im_odoo_support/views/im_odoo_support.xml b/addons/im_odoo_support/views/im_odoo_support.xml
index 85a8bf6bdd1..0f718257774 100644
--- a/addons/im_odoo_support/views/im_odoo_support.xml
+++ b/addons/im_odoo_support/views/im_odoo_support.xml
@@ -6,7 +6,7 @@
             <xpath expr="." position="inside">
                <script type="text/javascript" src="/im_odoo_support/static/src/js/im_odoo_support.js"></script>
                 <script type="text/javascript">
-                    odoo.define(['im_odoo_support.OdooSupport'], function (require) {
+                    odoo.define(function (require) {
                         var OdooSupport = require('im_odoo_support.OdooSupport');
                         new OdooSupport(
                             "<t t-esc="request.session.login"/>",
diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
index 100bd1ea0b1..71e74bedab7 100644
--- a/addons/mail/static/src/js/announcement.js
+++ b/addons/mail/static/src/js/announcement.js
@@ -1,4 +1,4 @@
-odoo.define(['web.core', 'web.Model', 'web.session', 'web.WebClient'], function (require) {
+odoo.define('mail.announcement', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0abc9f189bf..03165a1e421 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1,4 +1,4 @@
-odoo.define('mail.mail', ['mail.utils', 'web.core', 'web.data', 'web.form_common', 'web.pyeval', 'web.SearchView', 'web.session', 'web.SystrayMenu', 'web.time', 'web.utils', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('mail.mail', function (require) {
 "use strict";
 
 var mail_utils = require('mail.utils');
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 3d6d6d1ed16..1f5c385fc11 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -1,4 +1,4 @@
-odoo.define('mail.mail_followers', ['mail.utils', 'web.core', 'web.data', 'web.Dialog', 'web.form_common', 'web.session', 'web.web_client'], function (require) {
+odoo.define('mail.mail_followers', function (require) {
 "use strict";
 
 var mail_utils = require('mail.utils');
diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js
index 9a96e2ef78e..604c1662579 100644
--- a/addons/mail/static/src/js/many2many_tags_email.js
+++ b/addons/mail/static/src/js/many2many_tags_email.js
@@ -1,4 +1,4 @@
-odoo.define('mail.many2manytags', ['web.core', 'web.form_common', 'web.form_relational', 'web.Model'], function (require) {
+odoo.define('mail.many2manytags', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
index b0ba8027fdb..5a80c0685de 100644
--- a/addons/mail/static/src/js/suggestions.js
+++ b/addons/mail/static/src/js/suggestions.js
@@ -1,4 +1,4 @@
-odoo.define(['mail.mail', 'web.core', 'web.data', 'web.session', 'web.Widget'], function (require) {
+odoo.define('mail.suggestion', function (require) {
 
 var mail = require('mail.mail');
 var core = require('web.core');
diff --git a/addons/mail_tip/static/src/js/mail_tip.js b/addons/mail_tip/static/src/js/mail_tip.js
index fefc95e5dbb..0ac5f47db4f 100644
--- a/addons/mail_tip/static/src/js/mail_tip.js
+++ b/addons/mail_tip/static/src/js/mail_tip.js
@@ -1,4 +1,4 @@
-odoo.define(['mail.mail', 'web.core'], function (require) {
+odoo.define('mail_tip.mail_tip', function (require) {
 "use strict";
 
 var mail = require('mail.mail');
diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index ec03550d1fc..b43a138f2c2 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -1,4 +1,4 @@
-odoo.define('mass_mailing.mass_mailing', ['web.core', 'web_kanban.common', 'web_kanban.KanbanView'], function (require) {
+odoo.define('mass_mailing.mass_mailing', function (require) {
 
 var core = require('web.core');
 var common = require('web_kanban.common');
diff --git a/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js b/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
index 4a4188a8401..8a10d714b9b 100644
--- a/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
+++ b/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_mass_mailing.editor', ['web.core', 'website.editor', 'website.snippet.editor', 'website.website'], function (require) {
+odoo.define('website_mass_mailing.editor', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/mass_mailing/static/src/js/website_mass_mailing.js b/addons/mass_mailing/static/src/js/website_mass_mailing.js
index 3d7353dbeb2..5af42260990 100644
--- a/addons/mass_mailing/static/src/js/website_mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/website_mass_mailing.js
@@ -1,4 +1,4 @@
-odoo.define('mass_mailing.website_integration', ['web.ajax', 'web.utils', 'website.snippets.animation', 'website.website'], function (require) {
+odoo.define('mass_mailing.website_integration', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 53b7d18b964..b504fefcfcb 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,4 +1,4 @@
-odoo.define('pad.pad', ['web.core', 'web.form_common'], function (require) {
+odoo.define('pad.pad', function (require) {
 
 var core = require('web.core');
 var form_common = require('web.form_common');
diff --git a/addons/planner/static/src/js/planner.js b/addons/planner/static/src/js/planner.js
index d8ad394cb2b..5613cfef778 100644
--- a/addons/planner/static/src/js/planner.js
+++ b/addons/planner/static/src/js/planner.js
@@ -1,4 +1,4 @@
-odoo.define('planner.planner', ['web.core', 'web.Model', 'web.session', 'web.SystrayMenu', 'web.Widget'], function (require) {
+odoo.define('planner.planner', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/planner_crm/static/src/js/planner_crm.js b/addons/planner_crm/static/src/js/planner_crm.js
index 0e67b5608db..e03f726ce3c 100644
--- a/addons/planner_crm/static/src/js/planner_crm.js
+++ b/addons/planner_crm/static/src/js/planner_crm.js
@@ -1,4 +1,4 @@
-odoo.define('planner_crm.planner', ['planner.planner'], function (require) {
+odoo.define('planner_crm.planner', function (require) {
 "use strict";
 
 var planner = require('planner.planner');
diff --git a/addons/point_of_sale/static/src/js/chrome.js b/addons/point_of_sale/static/src/js/chrome.js
index 8baee366c55..360449970ae 100644
--- a/addons/point_of_sale/static/src/js/chrome.js
+++ b/addons/point_of_sale/static/src/js/chrome.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.chrome', ['point_of_sale.BaseWidget', 'point_of_sale.gui', 'point_of_sale.keyboard', 'point_of_sale.models', 'web.core'], function (require) {
+odoo.define('point_of_sale.chrome', function (require) {
 "use strict";
 
 var PosBaseWidget = require('point_of_sale.BaseWidget');
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index c928e1f0eef..4e69f748a73 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.DB', ['web.core'], function (require) {
+odoo.define('point_of_sale.DB', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 0a965eda8a1..d3232086642 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.devices', ['web.core', 'web.Session'], function (require) {
+odoo.define('point_of_sale.devices', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/point_of_sale/static/src/js/gui.js b/addons/point_of_sale/static/src/js/gui.js
index bd0f6236947..99b927890a2 100644
--- a/addons/point_of_sale/static/src/js/gui.js
+++ b/addons/point_of_sale/static/src/js/gui.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.gui', ['web.core', 'web.Model'], function (require) {
+odoo.define('point_of_sale.gui', function (require) {
 "use strict";
 // this file contains the Gui, which is the pos 'controller'. 
 // It contains high level methods to manipulate the interface
diff --git a/addons/point_of_sale/static/src/js/keyboard.js b/addons/point_of_sale/static/src/js/keyboard.js
index 3bb894731c0..0e46cfbcfad 100644
--- a/addons/point_of_sale/static/src/js/keyboard.js
+++ b/addons/point_of_sale/static/src/js/keyboard.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.keyboard', ['web.Widget'], function (require) {
+odoo.define('point_of_sale.keyboard', function (require) {
 "use strict";
 
 var Widget = require('web.Widget');
diff --git a/addons/point_of_sale/static/src/js/main.js b/addons/point_of_sale/static/src/js/main.js
index 1d2f4f3238f..1af93ff17c7 100644
--- a/addons/point_of_sale/static/src/js/main.js
+++ b/addons/point_of_sale/static/src/js/main.js
@@ -1,5 +1,5 @@
 
-odoo.define('point_of_sale.main', ['point_of_sale.chrome', 'web.core'], function (require) {
+odoo.define('point_of_sale.main', function (require) {
 "use strict";
 
 var chrome = require('point_of_sale.chrome');
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 15cca2d54fc..376c0b319d5 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.models', ['barcodes.BarcodeParser', 'point_of_sale.DB', 'point_of_sale.devices', 'web.core', 'web.Model', 'web.session', 'web.time', 'web.utils'], function (require) {
+odoo.define('point_of_sale.models', function (require) {
 "use strict";
 
 var BarcodeParser = require('barcodes.BarcodeParser');
diff --git a/addons/point_of_sale/static/src/js/popups.js b/addons/point_of_sale/static/src/js/popups.js
index c4f4fcc84c9..3a8ece4a49e 100644
--- a/addons/point_of_sale/static/src/js/popups.js
+++ b/addons/point_of_sale/static/src/js/popups.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.popups', ['point_of_sale.BaseWidget', 'point_of_sale.gui'], function (require) {
+odoo.define('point_of_sale.popups', function (require) {
 "use strict";
 
 // This file contains the Popups.
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index dfc8366e39c..a1d3a334770 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.screens', ['point_of_sale.BaseWidget', 'point_of_sale.gui', 'point_of_sale.models', 'web.core', 'web.Model', 'web.utils'], function (require) {
+odoo.define('point_of_sale.screens', function (require) {
 "use strict";
 // This file contains the Screens definitions. Screens are the
 // content of the right pane of the pos, containing the main functionalities. 
diff --git a/addons/point_of_sale/static/src/js/tests.js b/addons/point_of_sale/static/src/js/tests.js
index b41488756bb..9e55f318f42 100644
--- a/addons/point_of_sale/static/src/js/tests.js
+++ b/addons/point_of_sale/static/src/js/tests.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.Tour', ['web.Tour'], function (require) {
+odoo.define('point_of_sale.Tour', function (require) {
 "use strict";
 
 var Tour = require('web.Tour');
diff --git a/addons/point_of_sale/static/src/js/widget_base.js b/addons/point_of_sale/static/src/js/widget_base.js
index fae2b29f1cb..7c885989f2b 100644
--- a/addons/point_of_sale/static/src/js/widget_base.js
+++ b/addons/point_of_sale/static/src/js/widget_base.js
@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.BaseWidget', ['web.utils', 'web.Widget'], function (require) {
+odoo.define('point_of_sale.BaseWidget', function (require) {
 "use strict";
 
 var utils = require('web.utils');
diff --git a/addons/point_of_sale/views/templates.xml b/addons/point_of_sale/views/templates.xml
index 9fb5a8f5beb..0b9802e4709 100644
--- a/addons/point_of_sale/views/templates.xml
+++ b/addons/point_of_sale/views/templates.xml
@@ -31,7 +31,7 @@
         <t t-call-assets="point_of_sale.assets"/>
 
         <script type="text/javascript" id="loading-script" t-raw="init">
-            odoo.define('web.web_client', ['point_of_sale.main', 'web.WebClient'], function (require) {
+            odoo.define('web.web_client', function (require) {
                 var WebClient = require('web.WebClient');
                 var web_client = new WebClient();
 
diff --git a/addons/pos_discount/static/src/js/discount.js b/addons/pos_discount/static/src/js/discount.js
index 3ad09c4be1e..d47fbd751a4 100644
--- a/addons/pos_discount/static/src/js/discount.js
+++ b/addons/pos_discount/static/src/js/discount.js
@@ -1,4 +1,4 @@
-odoo.define('pos_discount.pos_discount', ['point_of_sale.screens'], function (require) {
+odoo.define('pos_discount.pos_discount', function (require) {
 "use strict";
 
 var screens = require('point_of_sale.screens');
diff --git a/addons/pos_loyalty/static/src/js/loyalty.js b/addons/pos_loyalty/static/src/js/loyalty.js
index c26303b72a1..90040ea6ee3 100644
--- a/addons/pos_loyalty/static/src/js/loyalty.js
+++ b/addons/pos_loyalty/static/src/js/loyalty.js
@@ -1,4 +1,4 @@
-odoo.define('pos_loyalty.pos_loyalty', ['point_of_sale.models', 'point_of_sale.screens', 'web.core', 'web.utils'], function (require) {
+odoo.define('pos_loyalty.pos_loyalty', function (require) {
 "use strict";
 
 var models = require('point_of_sale.models');
diff --git a/addons/pos_reprint/static/src/js/reprint.js b/addons/pos_reprint/static/src/js/reprint.js
index 9c0d17c6e72..8c49beb8e16 100644
--- a/addons/pos_reprint/static/src/js/reprint.js
+++ b/addons/pos_reprint/static/src/js/reprint.js
@@ -1,4 +1,4 @@
-odoo.define('pos_reprint.pos_reprint', ['point_of_sale.devices', 'point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_reprint.pos_reprint', function (require) {
 "use strict";
 
 var devices = require('point_of_sale.devices');
diff --git a/addons/pos_restaurant/static/src/js/floors.js b/addons/pos_restaurant/static/src/js/floors.js
index f8e42db9774..bbf102fc13f 100644
--- a/addons/pos_restaurant/static/src/js/floors.js
+++ b/addons/pos_restaurant/static/src/js/floors.js
@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.floors', ['point_of_sale.BaseWidget', 'point_of_sale.chrome', 'point_of_sale.gui', 'point_of_sale.models', 'point_of_sale.screens', 'web.core', 'web.Model'], function (require) {
+odoo.define('pos_restaurant.floors', function (require) {
 "use strict";
 
 var PosBaseWidget = require('point_of_sale.BaseWidget');
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index 10c430fe50d..4f218dbdaf6 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.multiprint', ['point_of_sale.models', 'point_of_sale.screens', 'web.core', 'web.Session'], function (require) {
+odoo.define('pos_restaurant.multiprint', function (require) {
 "use strict";
 
 var models = require('point_of_sale.models');
diff --git a/addons/pos_restaurant/static/src/js/notes.js b/addons/pos_restaurant/static/src/js/notes.js
index f95a256e45d..b51e1465962 100644
--- a/addons/pos_restaurant/static/src/js/notes.js
+++ b/addons/pos_restaurant/static/src/js/notes.js
@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.notes', ['point_of_sale.models', 'point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_restaurant.notes', function (require) {
 "use strict";
 
 console.log("notes");
diff --git a/addons/pos_restaurant/static/src/js/printbill.js b/addons/pos_restaurant/static/src/js/printbill.js
index 697e4dbef2e..3c9cacdda91 100644
--- a/addons/pos_restaurant/static/src/js/printbill.js
+++ b/addons/pos_restaurant/static/src/js/printbill.js
@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.printbill', ['point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_restaurant.printbill', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/pos_restaurant/static/src/js/splitbill.js b/addons/pos_restaurant/static/src/js/splitbill.js
index d85296355e7..9dd7e7449e2 100644
--- a/addons/pos_restaurant/static/src/js/splitbill.js
+++ b/addons/pos_restaurant/static/src/js/splitbill.js
@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.splitbill', ['point_of_sale.gui', 'point_of_sale.models', 'point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_restaurant.splitbill', function (require) {
 "use strict";
 
 var gui = require('point_of_sale.gui');
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 057a6913d9a..45b1bda964c 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -1,4 +1,4 @@
-odoo.define('project.update_kanban', ['web_kanban.common', 'web_kanban.KanbanView', 'web.data', 'web.session'], function (require) {
+odoo.define('project.update_kanban', function (require) {
 
 var kanban_common = require('web_kanban.common');
 var KanbanView = require('web_kanban.KanbanView');
diff --git a/addons/purchase_requisition/static/src/js/web_addons.js b/addons/purchase_requisition/static/src/js/web_addons.js
index 571b69d3ce0..9e913df53ad 100644
--- a/addons/purchase_requisition/static/src/js/web_addons.js
+++ b/addons/purchase_requisition/static/src/js/web_addons.js
@@ -1,4 +1,4 @@
-odoo.define('purchase_requisition.purchase_requisition', ['web.core', 'web.ListView', 'web.Model'], function (require) {
+odoo.define('purchase_requisition.purchase_requisition', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/report/static/src/js/qwebactionmanager.js b/addons/report/static/src/js/qwebactionmanager.js
index 339ae7d20c6..825ac47030a 100644
--- a/addons/report/static/src/js/qwebactionmanager.js
+++ b/addons/report/static/src/js/qwebactionmanager.js
@@ -1,4 +1,4 @@
-odoo.define('report.report', ['web.ActionManager', 'web.core', 'web.crash_manager', 'web.framework', 'web.session'], function (require) {
+odoo.define('report.report', function (require) {
 
 var ActionManager = require('web.ActionManager');
 var core = require('web.core');
diff --git a/addons/sales_team/static/src/js/sales_team.js b/addons/sales_team/static/src/js/sales_team.js
index 8a48c03a3fe..40f976a465a 100644
--- a/addons/sales_team/static/src/js/sales_team.js
+++ b/addons/sales_team/static/src/js/sales_team.js
@@ -1,4 +1,4 @@
-odoo.define('sales_team.update_kanban', ['web_kanban.KanbanView', 'web_kanban.common', 'web.data', 'web.session'], function (require) {
+odoo.define('sales_team.update_kanban', function (require) {
 "use strict";
 
 var KanbanView = require('web_kanban.KanbanView');
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 6a8d142ab7e..2fec003e9ff 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -1,4 +1,4 @@
-odoo.define(['mail.mail', 'web.core', 'web.data', 'web.Model', 'web.pyeval', 'web.session', 'web.Sidebar', 'web.ViewManager'], function (require) {
+odoo.define('share.share', function (require) {
 
 var mail = require('mail.mail');
 var core = require('web.core');
diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js
index 506697baa9d..496759c4efe 100644
--- a/addons/stock/static/src/js/widgets.js
+++ b/addons/stock/static/src/js/widgets.js
@@ -1,4 +1,4 @@
-odoo.define(['web.core', 'web.data', 'web.Dialog', 'web.Model', 'web.session', 'web.web_client', 'web.Widget', 'web_kanban.kanban_common'], function (require) {
+odoo.define('stock.widgets', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/stock/views/stock.xml b/addons/stock/views/stock.xml
index 5177de8c0b3..284bc9e3a0c 100644
--- a/addons/stock/views/stock.xml
+++ b/addons/stock/views/stock.xml
@@ -33,7 +33,7 @@
         <t t-call-assets="web.assets_backend" t-css="false" />
 
         <script type="text/javascript" id="loading-script" t-raw="init">
-            odoo.define('web.web_client', ['web.WebClient'], function (require) {
+            odoo.define('web.web_client', function (require) {
                 var WebClient = require('web.WebClient');
                 var web_client = new WebClient();
                 web_client.do_push_state = function (){};
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
index d05fc5412af..d91b1664daf 100644
--- a/addons/survey/static/src/js/survey.js
+++ b/addons/survey/static/src/js/survey.js
@@ -1,4 +1,4 @@
-odoo.define('survey.survey', ['website.website'], function (require) {
+odoo.define('survey.survey', function (require) {
 'use strict';
 
 var website = require('website.website');
diff --git a/addons/survey/static/src/js/survey_result.js b/addons/survey/static/src/js/survey_result.js
index e6f8afedeae..cae9ba4da23 100644
--- a/addons/survey/static/src/js/survey_result.js
+++ b/addons/survey/static/src/js/survey_result.js
@@ -1,4 +1,4 @@
-odoo.define('survey.result', ['website.website'], function (require) {
+odoo.define('survey.result', function (require) {
 'use strict';
 
 var website = require('website.website');
diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js
index 4c49a7a5772..efc617c4af2 100644
--- a/addons/web/static/src/js/action_manager.js
+++ b/addons/web/static/src/js/action_manager.js
@@ -1,4 +1,4 @@
-odoo.define('web.ActionManager', ['web.core', 'web.crash_manager', 'web.data', 'web.Dialog', 'web.framework', 'web.pyeval', 'web.session', 'web.ViewManager', 'web.Widget'], function (require) {
+odoo.define('web.ActionManager', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index 67834ebf6b2..28ed102005c 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -21,6 +21,9 @@
         _: _,
     });
 
+    var commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
+    var cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g;
+
     var debug = ($.deparam($.param.querystring()).debug !== undefined);
 
     var odoo = window.odoo = {
@@ -49,10 +52,20 @@
             services: services,
         },
         define: function () {
-            var args = Array.prototype.slice.call(arguments),
-                name = typeof args[0] === 'string' ? args.shift() : _.uniqueId('__job'),
-                deps = args[0] instanceof Array ? args.shift() : [],
-                factory = args[0];
+            var args = Array.prototype.slice.call(arguments);
+            var name = typeof args[0] === 'string' ? args.shift() : _.uniqueId('__job');
+            var factory = args[args.length - 1];
+            var deps;
+            if (args[0] instanceof Array) {
+                deps = args[0];
+            } else {
+                deps = [];
+                factory.toString()
+                    .replace(commentRegExp, '')
+                    .replace(cjsRequireRegExp, function (match, dep) {
+                        deps.push(dep);
+                    });
+            }
 
             if (odoo.debug) {
                 if (!(deps instanceof Array)) {
diff --git a/addons/web/static/src/js/compatibility.js b/addons/web/static/src/js/compatibility.js
index 4c0a4538bc1..cb1b3b795de 100644
--- a/addons/web/static/src/js/compatibility.js
+++ b/addons/web/static/src/js/compatibility.js
@@ -7,36 +7,7 @@
 // facilitate migration.  Odoo addons should not use the 'openerp' variable at 
 // all.
 // ------------------------------------------------------------------------------
-odoo.define('web.compatibility', [
-    'web.ActionManager',
-    'web.core', 
-    'web.data',
-    'web.Dialog', 
-    'web.FavoriteMenu',
-    'web.form_common', 
-    'web.form_relational',
-    'web.form_widgets',
-    'web.formats',
-    'web.FormView',
-    'web.framework',
-    'web.ListView',
-    'web.Menu', 
-    'web.Model', 
-    'web.pyeval',
-    'web.Registry',
-    'web.SearchView',
-    'web.session',
-    'web.Sidebar',
-    'web.SystrayMenu', 
-    'web.time',
-    'web.UserMenu', 
-    'web.utils',
-    'web.View',
-    'web.ViewManager',
-    'web.WebClient', 
-    'web.Widget', 
-    ], 
-    function (require) {
+odoo.define('web.compatibility', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');
@@ -215,9 +186,9 @@ function start_modules (modules) {
 
 });
 
-odoo.define('mail.compatibility', ['mail.mail'], function (require) {
+odoo.define('mail.compatibility', function (require) {
 var mail = require('mail.mail');
-return;
+
 window.openerp = window.openerp || {};
 openerp.mail = {};
 openerp.mail.Wall = mail.Wall;
diff --git a/addons/web/static/src/js/framework/ajax.js b/addons/web/static/src/js/framework/ajax.js
index 00da4610f9c..dd1eee906c1 100644
--- a/addons/web/static/src/js/framework/ajax.js
+++ b/addons/web/static/src/js/framework/ajax.js
@@ -1,4 +1,4 @@
-odoo.define('web.ajax', ['web.time'], function (require) {
+odoo.define('web.ajax', function (require) {
 "use strict";
 
 var time = require('web.time');
diff --git a/addons/web/static/src/js/framework/core.js b/addons/web/static/src/js/framework/core.js
index 5bfe975c7fd..f7fc67e602f 100644
--- a/addons/web/static/src/js/framework/core.js
+++ b/addons/web/static/src/js/framework/core.js
@@ -1,4 +1,4 @@
-odoo.define('web.core', ['web.Class', 'web.mixins', 'web.Registry', 'web.translation', 'qweb', '_', '$'], function (require) {
+odoo.define('web.core', function (require) {
 "use strict";
 
 var Class = require('web.Class');
diff --git a/addons/web/static/src/js/framework/crash_manager.js b/addons/web/static/src/js/framework/crash_manager.js
index 416ef4b4136..ec4350d2031 100644
--- a/addons/web/static/src/js/framework/crash_manager.js
+++ b/addons/web/static/src/js/framework/crash_manager.js
@@ -1,9 +1,9 @@
-odoo.define('web.crash_manager', ['web.CrashManager'], function (require) {
+odoo.define('web.crash_manager', function (require) {
     var CrashManager = require('web.CrashManager');
     return new CrashManager();
 });
 
-odoo.define('web.CrashManager', ['web.ajax', 'web.core', 'web.Dialog', 'web.session'], function (require) {
+odoo.define('web.CrashManager', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index f8f091be80d..efbce3a5056 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -1,4 +1,4 @@
-odoo.define('web.data', ['web.core', 'web.Model', 'web.session', 'web.pyeval'], function (require) {
+odoo.define('web.data', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/framework/dialog.js b/addons/web/static/src/js/framework/dialog.js
index 9464c452124..81d8860d4c3 100644
--- a/addons/web/static/src/js/framework/dialog.js
+++ b/addons/web/static/src/js/framework/dialog.js
@@ -1,4 +1,4 @@
-odoo.define('web.Dialog', ['web.core', 'web.Widget'], function (require) {
+odoo.define('web.Dialog', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/framework/formats.js b/addons/web/static/src/js/framework/formats.js
index 4126447c76a..a8dc52bee4a 100644
--- a/addons/web/static/src/js/framework/formats.js
+++ b/addons/web/static/src/js/framework/formats.js
@@ -1,4 +1,4 @@
-odoo.define('web.formats', ['web.core', 'web.time', 'web.utils'], function (require) {
+odoo.define('web.formats', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/framework/misc.js b/addons/web/static/src/js/framework/misc.js
index a3aaadbc46c..804a30cef7d 100644
--- a/addons/web/static/src/js/framework/misc.js
+++ b/addons/web/static/src/js/framework/misc.js
@@ -1,4 +1,4 @@
-odoo.define('web.framework', ['web.core', 'web.crash_manager', 'web.session', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.framework', function (require) {
 "use strict";
 
 var core = require('web.core');
@@ -331,7 +331,7 @@ return {
 
 });
 
-odoo.define('web.session', ['web.Session'], function (require) {
+odoo.define('web.session', function (require) {
     var Session = require('web.Session');
     var modules = odoo._modules;
     return new Session(undefined, undefined, {modules:modules});
diff --git a/addons/web/static/src/js/framework/mixins.js b/addons/web/static/src/js/framework/mixins.js
index 102b75a9e4b..0f495392a6c 100644
--- a/addons/web/static/src/js/framework/mixins.js
+++ b/addons/web/static/src/js/framework/mixins.js
@@ -1,4 +1,4 @@
-odoo.define('web.mixins', ['web.Class', 'web.utils'], function (require) {
+odoo.define('web.mixins', function (require) {
 "use strict";
 
 var Class = require('web.Class');
diff --git a/addons/web/static/src/js/framework/model.js b/addons/web/static/src/js/framework/model.js
index f1a1555fd6f..ca4c29452a3 100644
--- a/addons/web/static/src/js/framework/model.js
+++ b/addons/web/static/src/js/framework/model.js
@@ -1,4 +1,4 @@
-odoo.define('web.Model', ['web.Class', 'web.session', 'web.utils'], function (require) {
+odoo.define('web.Model', function (require) {
 "use strict";
 
 var Class = require('web.Class');
@@ -110,7 +110,7 @@ var Model = Class.extend({
 return Model;
 });
 
-odoo.define('web.DataModel', ['web.data', 'web.Model', 'web.pyeval', 'web.session'], function (require) {
+odoo.define('web.DataModel', function (require) {
 "use strict";
 
 var data = require('web.data');
diff --git a/addons/web/static/src/js/framework/pyeval.js b/addons/web/static/src/js/framework/pyeval.js
index 18d43db318b..ce25e7af534 100644
--- a/addons/web/static/src/js/framework/pyeval.js
+++ b/addons/web/static/src/js/framework/pyeval.js
@@ -1,4 +1,4 @@
-odoo.define('web.pyeval', ['web.core', 'web.session', 'web.utils'], function (require) {
+odoo.define('web.pyeval', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/framework/registry.js b/addons/web/static/src/js/framework/registry.js
index c90614cf94a..b8bc1dbadfe 100644
--- a/addons/web/static/src/js/framework/registry.js
+++ b/addons/web/static/src/js/framework/registry.js
@@ -1,4 +1,4 @@
-odoo.define('web.Registry', ['web.Class'], function (require) {
+odoo.define('web.Registry', function (require) {
 "use strict";
 
 var Class = require('web.Class');
diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js
index f81fec5ab54..51ebc10b172 100644
--- a/addons/web/static/src/js/framework/session.js
+++ b/addons/web/static/src/js/framework/session.js
@@ -1,4 +1,4 @@
-odoo.define('web.Session', ['web.ajax', 'web.core', 'web.utils'], function (require) {
+odoo.define('web.Session', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/web/static/src/js/framework/time.js b/addons/web/static/src/js/framework/time.js
index 7a13655c39b..2c590c7304c 100644
--- a/addons/web/static/src/js/framework/time.js
+++ b/addons/web/static/src/js/framework/time.js
@@ -1,4 +1,4 @@
-odoo.define('web.time', ['web.translation', 'web.utils'], function (require) {
+odoo.define('web.time', function (require) {
 "use strict";
 
 var translation = require('web.translation');
diff --git a/addons/web/static/src/js/framework/translation.js b/addons/web/static/src/js/framework/translation.js
index 6f44a57b275..00044ee13fc 100644
--- a/addons/web/static/src/js/framework/translation.js
+++ b/addons/web/static/src/js/framework/translation.js
@@ -1,9 +1,8 @@
 
-odoo.define('web.translation', ['web.Class', 'qweb'], function (require) {
+odoo.define('web.translation', function (require) {
 "use strict";
 
 var Class = require('web.Class');
-
 var qweb = require('qweb');
 
 
diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js
index d412a17bc9a..29a15d47a30 100644
--- a/addons/web/static/src/js/framework/utils.js
+++ b/addons/web/static/src/js/framework/utils.js
@@ -1,4 +1,4 @@
-odoo.define('web.utils', ['web.Class', 'web.translation'], function (require) {
+odoo.define('web.utils', function (require) {
 "use strict";
 
 var Class = require('web.Class');
diff --git a/addons/web/static/src/js/framework/view.js b/addons/web/static/src/js/framework/view.js
index c315e53d710..145989ad7aa 100644
--- a/addons/web/static/src/js/framework/view.js
+++ b/addons/web/static/src/js/framework/view.js
@@ -1,4 +1,4 @@
-odoo.define('web.View', ['web.core', 'web.data', 'web.pyeval', 'web.Widget'], function (require) {
+odoo.define('web.View', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/framework/widget.js b/addons/web/static/src/js/framework/widget.js
index 6d691f812e0..aae0ed36c19 100644
--- a/addons/web/static/src/js/framework/widget.js
+++ b/addons/web/static/src/js/framework/widget.js
@@ -1,4 +1,4 @@
-odoo.define('web.Widget', ['web.core', 'web.session'], function (require) {
+odoo.define('web.Widget', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/menu.js b/addons/web/static/src/js/menu.js
index c7bf4b07828..95198e6dedf 100644
--- a/addons/web/static/src/js/menu.js
+++ b/addons/web/static/src/js/menu.js
@@ -1,4 +1,4 @@
-odoo.define('web.Menu', ['web.core', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.Menu', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 7ee3e43f049..c486abf126c 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -1,4 +1,4 @@
-odoo.define('web.Tour', ['web.core'], function (require) {
+odoo.define('web.Tour', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/view_manager.js b/addons/web/static/src/js/view_manager.js
index dfef449fe9e..869ba4f1b0c 100644
--- a/addons/web/static/src/js/view_manager.js
+++ b/addons/web/static/src/js/view_manager.js
@@ -1,4 +1,4 @@
-odoo.define('web.ViewManager', ['web.core', 'web.data', 'web.Dialog', 'web.formats', 'web.framework', 'web.Model', 'web.pyeval', 'web.utils', 'web.SearchView', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.ViewManager', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/form_common.js b/addons/web/static/src/js/views/form_common.js
index c1f679fa4f3..39368db840c 100644
--- a/addons/web/static/src/js/views/form_common.js
+++ b/addons/web/static/src/js/views/form_common.js
@@ -1,4 +1,4 @@
-odoo.define('web.form_common', ['web.core', 'web.data', 'web.Dialog', 'web.ListView', 'web.pyeval', 'web.SearchView', 'web.session', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.form_common', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 19ca1903048..376a01f07f5 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1,4 +1,4 @@
-odoo.define('web.form_relational', ['web.core', 'web.data', 'web.Dialog', 'web.form_common', 'web.FormView', 'web.ListView', 'web.Model', 'web.session', 'web.utils', 'web.ViewManager'], function (require) {
+odoo.define('web.form_relational', function (require) {
 "use strict";
 
 var core = require('web.core');
@@ -1935,7 +1935,7 @@ return {
 
 });
 
-odoo.define('web_kanban.Many2ManyKanbanView', ['web.core', 'web_kanban.KanbanView', 'web.Widget'], function (require) {
+odoo.define('web_kanban.Many2ManyKanbanView', function (require) {
     "use strict";
     // This code has a dependency on the addon web_kanban.  This is a weird dependency issue.  To fix it,
     // we should either move this code into web_kanban, or move web_kanban into the web client.
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index ac7ea1d7888..63981ec0578 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -1,4 +1,4 @@
-odoo.define('web.FormView', ['web.core', 'web.crash_manager', 'web.data', 'web.Dialog', 'web.form_common', 'web.Model', 'web.Sidebar', 'web.utils', 'web.View'], function (require) {
+odoo.define('web.FormView', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 69150e4f199..0757f581457 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -1,4 +1,4 @@
-odoo.define('web.form_widgets', ['web.core', 'web.crash_manager', 'web.data', 'web.datepicker', 'web.Dialog', 'web.form_common', 'web.formats', 'web.framework', 'web.Model', 'web.pyeval', 'web.session', 'web.utils'], function (require) {
+odoo.define('web.form_widgets', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js
index 26826b19aac..f8e89a27e86 100644
--- a/addons/web/static/src/js/views/graph_view.js
+++ b/addons/web/static/src/js/views/graph_view.js
@@ -1,4 +1,4 @@
-odoo.define('web.GraphView', ['web.core', 'web.GraphWidget', 'web.Model', 'web.View'], function (require) {
+odoo.define('web.GraphView', function (require) {
 "use strict";
 /*---------------------------------------------------------
  * Odoo Graph view
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index b06ab42f346..8450c9d1d7e 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -1,4 +1,4 @@
-odoo.define('web.GraphWidget', ['web.core', 'web.Model', 'web.Widget'], function (require) {
+odoo.define('web.GraphWidget', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/list_common.js b/addons/web/static/src/js/views/list_common.js
index e2e9ec1eb41..f93625e8edd 100644
--- a/addons/web/static/src/js/views/list_common.js
+++ b/addons/web/static/src/js/views/list_common.js
@@ -1,4 +1,4 @@
-odoo.define('web.list_common', ['web.core'], function (require) {
+odoo.define('web.list_common', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index ef875e51679..93bf5b5071f 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -1,5 +1,5 @@
 
-odoo.define('web.ListView', ['web.core', 'web.data', 'web.DataExport', 'web.formats', 'web.list_common', 'web.Model', 'web.pyeval', 'web.session', 'web.Sidebar', 'web.utils', 'web.View'], function (require) {
+odoo.define('web.ListView', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js
index c4262fbce97..08f43164471 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -1,4 +1,4 @@
-odoo.define('web.ListEditor', ['web.core', 'web.FormView', 'web.list_common', 'web.ListView', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.ListEditor', function (require) {
 "use strict";    
 /*---------------------------------------------------------
  * Odoo Editable List view
diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js
index 8ca6e2976fb..cd401b3ea51 100644
--- a/addons/web/static/src/js/views/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot_view.js
@@ -1,4 +1,4 @@
-odoo.define('web.PivotView', ['web.core', 'web.crash_manager', 'web.formats', 'web.framework', 'web.Model', 'web.session', 'web.Sidebar', 'web.utils', 'web.View'], function (require) {
+odoo.define('web.PivotView', function (require) {
 "use strict";
 /*---------------------------------------------------------
  * Odoo Pivot Table view
diff --git a/addons/web/static/src/js/views/search_filters.js b/addons/web/static/src/js/views/search_filters.js
index dfc0d0bf4bc..287e7932639 100644
--- a/addons/web/static/src/js/views/search_filters.js
+++ b/addons/web/static/src/js/views/search_filters.js
@@ -1,4 +1,4 @@
-odoo.define('web.search_filters', ['web.core',  'web.datepicker', 'web.formats', 'web.Widget'], function (require) {
+odoo.define('web.search_filters', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/search_inputs.js b/addons/web/static/src/js/views/search_inputs.js
index 97678cc60c8..a89fa976a74 100644
--- a/addons/web/static/src/js/views/search_inputs.js
+++ b/addons/web/static/src/js/views/search_inputs.js
@@ -1,4 +1,4 @@
-odoo.define('web.search_inputs', ['web.core', 'web.data', 'web.formats', 'web.Model', 'web.pyeval', 'web.time', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.search_inputs', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/views/search_menus.js b/addons/web/static/src/js/views/search_menus.js
index 56df4657c48..54d83ba8f78 100644
--- a/addons/web/static/src/js/views/search_menus.js
+++ b/addons/web/static/src/js/views/search_menus.js
@@ -1,4 +1,4 @@
-odoo.define('web.FavoriteMenu', ['web.core', 'web.Model','web.pyeval', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.FavoriteMenu', function (require) {
 "use strict";
 
 var core = require('web.core');
@@ -247,7 +247,7 @@ return Widget.extend({
 
 });
 
-odoo.define('web.FilterMenu', ['web.Widget', 'web.search_filters', 'web.search_inputs'], function (require) {
+odoo.define('web.FilterMenu', function (require) {
 
 var search_filters = require('web.search_filters'),
     search_inputs = require('web.search_inputs'),
@@ -355,7 +355,7 @@ return Widget.extend({
 
 });
 
-odoo.define('web.GroupByMenu', ['web.Widget', 'web.core', 'web.search_inputs'], function (require) {
+odoo.define('web.GroupByMenu', function (require) {
 
 var Widget = require('web.Widget'),
     core = require('web.core'),
diff --git a/addons/web/static/src/js/views/search_view.js b/addons/web/static/src/js/views/search_view.js
index a459dfe666b..af18bdea9ac 100644
--- a/addons/web/static/src/js/views/search_view.js
+++ b/addons/web/static/src/js/views/search_view.js
@@ -1,4 +1,4 @@
-odoo.define('web.SearchView', ['web.AutoComplete', 'web.core', 'web.FavoriteMenu', 'web.FilterMenu', 'web.GroupByMenu', 'web.Model', 'web.pyeval', 'web.search_inputs', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.SearchView', function (require) {
 "use strict";
 
 var AutoComplete = require('web.AutoComplete');
@@ -715,7 +715,7 @@ return SearchView;
 
 });
 
-odoo.define('web.AutoComplete', ['web.Widget'], function (require) {
+odoo.define('web.AutoComplete', function (require) {
 "use strict";
 
 var Widget = require('web.Widget');
diff --git a/addons/web/static/src/js/views/tree_view.js b/addons/web/static/src/js/views/tree_view.js
index 7c3950a5407..b6e0e74a8de 100644
--- a/addons/web/static/src/js/views/tree_view.js
+++ b/addons/web/static/src/js/views/tree_view.js
@@ -1,4 +1,4 @@
-odoo.define('web.TreeView', ['web.core', 'web.data', 'web.formats', 'web.pyeval', 'web.session', 'web.View'], function (require) {
+odoo.define('web.TreeView', function (require) {
 "use strict";
 /*---------------------------------------------------------
  * Odoo Tree view
diff --git a/addons/web/static/src/js/web_client.js b/addons/web/static/src/js/web_client.js
index e4d943ce6bf..26eaf883aac 100644
--- a/addons/web/static/src/js/web_client.js
+++ b/addons/web/static/src/js/web_client.js
@@ -1,4 +1,4 @@
-odoo.define('web.WebClient', ['web.ActionManager', 'web.core', 'web.crash_manager', 'web.data', 'web.Loading', 'web.Menu', 'web.Model', 'web.Notification', 'web.session', 'web.SystrayMenu', 'web.UserMenu', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.WebClient', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');
diff --git a/addons/web/static/src/js/widgets/change_password.js b/addons/web/static/src/js/widgets/change_password.js
index d1b7e98c74e..0ddfb20c4df 100644
--- a/addons/web/static/src/js/widgets/change_password.js
+++ b/addons/web/static/src/js/widgets/change_password.js
@@ -1,4 +1,4 @@
-odoo.define('web.ChangePassword', ['web.core', 'web.Dialog', 'web.Widget'], function (require) {
+odoo.define('web.ChangePassword', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index 73ec37cdd17..946862d7102 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -1,4 +1,4 @@
-odoo.define('web.DataExport', ['web.core', 'web.crash_manager', 'web.data', 'web.Dialog', 'web.framework'], function (require) {
+odoo.define('web.DataExport', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/widgets/database_manager.js b/addons/web/static/src/js/widgets/database_manager.js
index 9bd5b4d05c3..180d42b59b6 100644
--- a/addons/web/static/src/js/widgets/database_manager.js
+++ b/addons/web/static/src/js/widgets/database_manager.js
@@ -1,4 +1,4 @@
-odoo.define('web.DatabaseManager', ['web.core', 'web.Dialog', 'web.framework', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('web.DatabaseManager', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js
index 7e242cf1d6e..124b14b803c 100644
--- a/addons/web/static/src/js/widgets/date_picker.js
+++ b/addons/web/static/src/js/widgets/date_picker.js
@@ -1,4 +1,4 @@
-odoo.define('web.datepicker', ['web.core', 'web.formats', 'web.time', 'web.Widget'], function (require) {
+odoo.define('web.datepicker', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/widgets/loading.js b/addons/web/static/src/js/widgets/loading.js
index 75ac1a8b4b8..4ccabcc199e 100644
--- a/addons/web/static/src/js/widgets/loading.js
+++ b/addons/web/static/src/js/widgets/loading.js
@@ -1,4 +1,4 @@
-odoo.define('web.Loading', ['web.core', 'web.framework', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.Loading', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/widgets/notification.js b/addons/web/static/src/js/widgets/notification.js
index d99ef75b324..d9376155787 100644
--- a/addons/web/static/src/js/widgets/notification.js
+++ b/addons/web/static/src/js/widgets/notification.js
@@ -1,4 +1,4 @@
-odoo.define('web.Notification', ['web.Widget'], function (require) {
+odoo.define('web.Notification', function (require) {
 "use strict";
 
 var Widget = require('web.Widget');
diff --git a/addons/web/static/src/js/widgets/sidebar.js b/addons/web/static/src/js/widgets/sidebar.js
index 7005ec2012e..e0bdcd3f57c 100644
--- a/addons/web/static/src/js/widgets/sidebar.js
+++ b/addons/web/static/src/js/widgets/sidebar.js
@@ -1,4 +1,4 @@
-odoo.define('web.Sidebar', ['web.core', 'web.data', 'web.Dialog', 'web.framework', 'web.pyeval', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.Sidebar', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/src/js/widgets/systray_menu.js b/addons/web/static/src/js/widgets/systray_menu.js
index eb218a51bc7..b969663e70b 100644
--- a/addons/web/static/src/js/widgets/systray_menu.js
+++ b/addons/web/static/src/js/widgets/systray_menu.js
@@ -1,4 +1,4 @@
-odoo.define('web.SystrayMenu', ['web.Widget'], function (require) {
+odoo.define('web.SystrayMenu', function (require) {
 "use strict";
 
 var Widget = require('web.Widget');
diff --git a/addons/web/static/src/js/widgets/user_menu.js b/addons/web/static/src/js/widgets/user_menu.js
index 450b0191486..fa5ea2bbdf7 100644
--- a/addons/web/static/src/js/widgets/user_menu.js
+++ b/addons/web/static/src/js/widgets/user_menu.js
@@ -1,4 +1,4 @@
-odoo.define('web.UserMenu', ['web.core', 'web.Dialog', 'web.framework', 'web.Model', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.UserMenu', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web/static/test/menu.js b/addons/web/static/test/menu.js
index 957607ae535..1c90b46fc46 100644
--- a/addons/web/static/test/menu.js
+++ b/addons/web/static/test/menu.js
@@ -1,298 +1,296 @@
-odoo.define('web.test.menu', ['web.Tour'], function (require) {
-    "use strict";
+odoo.define('web.test.menu', function (require) {
+"use strict";
 
-    var Tour = require('web.Tour');
+var Tour = require('web.Tour');
 
+function openmenu () {
+    setTimeout(function () {
+        $(".collapse:not(.in)").addClass("in");
+        $(".dropdown:not(.open)").addClass("open");
+    },3000);
+}
 
+Tour.register({
+    id:   'test_menu',
+    name: "Test all menu items",
+    path: '/web',
+    mode: 'test',
+    steps: [
+        {
+            title:     "begin test",
+            onload: function () {
+                localStorage.setItem('active_step', 0);
+                localStorage.setItem('menu_tested', "[]");
+            },
+        },
 
-    function openmenu () {
-        setTimeout(function () {
-            $(".collapse:not(.in)").addClass("in");
-            $(".dropdown:not(.open)").addClass("open");
-        },3000);
-    }
+        // log as admin
 
-    Tour.register({
-        id:   'test_menu',
-        name: "Test all menu items",
-        path: '/web',
-        mode: 'test',
-        steps: [
-            {
-                title:     "begin test",
-                onload: function () {
-                    localStorage.setItem('active_step', 0);
-                    localStorage.setItem('menu_tested', "[]");
-                },
+        {
+            title:     "log on as admin",
+            element:    ".oe_login_form button",
+            onload: function () {
+                $('input[name="login"], input[name="password"]').val("admin");
             },
+        },
+        {
+            title:     "load web admin",
+            waitFor:   ".oe_view_manager_body",
+            onload: function () {
+                localStorage.setItem('active_step', (+localStorage.getItem('active_step'))+1 );
+                openmenu();
+            },
+        },
+        {
+            title:     "click on Settings",
+            element:   '.oe_application_menu_placeholder a[data-menu]:contains(Settings)',
+            waitNot:   '.oe_loading:visible, button.oe_form_button:contains(Apply).already_tested',
+        },
 
-            // log as admin
+        //  add technical features to admin user
 
-            {
-                title:     "log on as admin",
-                element:    ".oe_login_form button",
-                onload: function () {
-                    $('input[name="login"], input[name="password"]').val("admin");
-                },
-            },
-            {
-                title:     "load web admin",
-                waitFor:   ".oe_view_manager_body",
-                onload: function () {
-                    localStorage.setItem('active_step', (+localStorage.getItem('active_step'))+1 );
-                    openmenu();
-                },
-            },
-            {
-                title:     "click on Settings",
-                element:   '.oe_application_menu_placeholder a[data-menu]:contains(Settings)',
-                waitNot:   '.oe_loading:visible, button.oe_form_button:contains(Apply).already_tested',
+        {
+            title:     "click on User form Admin",
+            element:   '.oe_secondary_menu a:visible:contains(Users)',
+            waitNot:   ".oe_loading:visible",
+        },
+        {
+            title:     "click on Admin",
+            element:   '.oe_list_field_cell:contains(Admin)',
+        },
+        {
+            waitFor:   '.oe_breadcrumb_item:contains(Admin)',
+            waitNot:   ".oe_loading:visible",
+        },
+        {
+            title:     "click on Edit button",
+            element:   'button.oe_form_button_edit',
+        },
+        {
+            title:     "click on Technical Features",
+            element:   'td:contains(Technical Features) + td input:not(:disabled):visible',
+            onend: function () {
+                $('td:contains(Technical Features) + td input:not(:disabled):visible').attr("checked", true);
             },
+        },
+        {
+            title:     "click on Save User",
+            waitFor:   'td:contains(Technical Features) + td input:checked:not(:disabled):visible',
+            element:   'button.oe_form_button_save',
+        },
 
-            //  add technical features to admin user
+        //  add technical features to demo user
 
-            {
-                title:     "click on User form Admin",
-                element:   '.oe_secondary_menu a:visible:contains(Users)',
-                waitNot:   ".oe_loading:visible",
-            },
-            {
-                title:     "click on Admin",
-                element:   '.oe_list_field_cell:contains(Admin)',
-            },
-            {
-                waitFor:   '.oe_breadcrumb_item:contains(Admin)',
-                waitNot:   ".oe_loading:visible",
-            },
-            {
-                title:     "click on Edit button",
-                element:   'button.oe_form_button_edit',
-            },
-            {
-                title:     "click on Technical Features",
-                element:   'td:contains(Technical Features) + td input:not(:disabled):visible',
-                onend: function () {
-                    $('td:contains(Technical Features) + td input:not(:disabled):visible').attr("checked", true);
-                },
-            },
-            {
-                title:     "click on Save User",
-                waitFor:   'td:contains(Technical Features) + td input:checked:not(:disabled):visible',
-                element:   'button.oe_form_button_save',
-            },
-
-            //  add technical features to demo user
-
-            {
-                title:     "click on User",
-                element:   '.oe_secondary_menu a:visible:contains(Users)',
-                waitFor:   'td:contains(Technical Features) + td input:disabled:visible',
-            },
-            {
-                title:     "click on Demo",
-                element:   '.oe_list_field_cell:contains(Demo)',
-            },
-            {
-                waitFor:   '.oe_breadcrumb_item:contains(Demo)',
-                waitNot:   ".oe_loading:visible",
-            },
-            {
-                title:     "click on Edit button",
-                element:   'button.oe_form_button_edit',
-            },
-            {
-                title:     "click on Technical Features",
-                element:   'td:contains(Technical Features) + td input:not(:disabled):visible',
-                onend: function () {
-                    $('td:contains(Technical Features) + td input:not(:disabled):visible').attr("checked", true);
-                    if (localStorage.getItem('active_step') === "2") {
-                        $('input').attr("checked", true);
-                        $('.oe_view_manager_body td:contains(Portal) + td input:visible').attr("checked", null);
-                        $('.oe_view_manager_body td:contains(Public) + td input:visible').attr("checked", null);
-                        $('select').each(function () {
-                            $('option:last', this).attr('selected', true);
-                        });
-                    }
-                },
-            },
-            {
-                title:     "click on Save User",
-                waitFor:   'td:contains(Technical Features) + td input:checked:not(:disabled):visible',
-                element:   'button.oe_form_button_save',
-                onload: function () {
-                    openmenu();
-                },
-            },
-
-            // log out
-
-            {
-                title:     "log out amdin",
-                waitFor:   'td:contains(Technical Features) + td input:disabled:visible',
-                element:   'a[data-menu="logout"]',
-            },
-
-            // log as demo
-
-            {
-                title:     "log on as demo user",
-                element:    ".oe_login_form button",
-                onload: function () {
-                    $('input[name="login"], input[name="password"]').val("demo");
-                },
-            },
-            {
-                title:     "load web demo",
-                waitFor:   ".oe_view_manager_body",
-                onload: function () {
-                    openmenu();
-                },
-                next:       "check",
-            },
-
-            // click all menu items
-
-            {
-                title:     "Click on top menu",
-                element:   '.oe_application_menu_placeholder a[data-menu]:not([data-action-model="ir.actions.act_url"]):not(.already_tested):first',
-                onload: function () {
-                    var $menu = $(this.element);
-                    console.log("Tour 'test_menu' click on: '"+$menu.text().replace(/^\s+|\s+$/g, '')+"'");
-                },
-                onend: function () {
-                    $(this.element).addClass('already_tested');
-                    $('.oe_secondary_submenu').show();
-                },
-                next: "check"
-            },
-            {
-                title:     "Click on sub menu",
-                element:   '.oe_secondary_menu a:not(.oe_menu_toggler):visible:not(.already_tested):first',
-                onload: function () {
-                    var $menu = $(this.element);
-                    console.log("Tour 'test_menu' click on: '"+$menu.find('span:first').text().replace(/^\s+|\s+$/g, '')+"'");
-                },
-                onend: function () {
-                    $(this.element).addClass('already_tested');
-                },
-                next: "check"
-            },
-            {
-                title:     "Click on need action",
-                element:   '.oe_secondary_menu a:not(.oe_menu_toggler) div.badge:visible:not(.already_tested):first',
-                onload: function () {
-                    var $menu = $(this.element);
-                    console.log("Tour 'test_menu' click on need action: '"+$menu.parent().find('span:first').text().replace(/^\s+|\s+$/g, '')+"'");
-                },
-                onend: function () {
-                    $(this.element).addClass('already_tested');
-                },
-                next: "check"
-            },
-            {
-                title:     "Click on switch view",
-                element:   '.oe_view_manager_switch li a:not(.already_tested):first',
-                onload: function () {
-                    var $menu = $(this.element);
-                    console.log("Tour 'test_menu' click on switch view: '"+$menu.data('original-title')+"'");
-                },
-                onend: function () {
-                    $(this.element).addClass('already_tested');
-                },
-                next: "check"
-            },
-
-            {
-                title:    "check",
-                waitNot:  "body:has("+
-                              ".oe_view_manager_body > *:visible:not(:empty).already_loaded:not(.oe_searchview_drawer_container), "+
-                              ".oe_form_sheetbg.already_loaded"+
-                          "):not(:has(.modal))",
-                wait: 100,
-                onerror: function () {
-                    return "Select next action";
+        {
+            title:     "click on User",
+            element:   '.oe_secondary_menu a:visible:contains(Users)',
+            waitFor:   'td:contains(Technical Features) + td input:disabled:visible',
+        },
+        {
+            title:     "click on Demo",
+            element:   '.oe_list_field_cell:contains(Demo)',
+        },
+        {
+            waitFor:   '.oe_breadcrumb_item:contains(Demo)',
+            waitNot:   ".oe_loading:visible",
+        },
+        {
+            title:     "click on Edit button",
+            element:   'button.oe_form_button_edit',
+        },
+        {
+            title:     "click on Technical Features",
+            element:   'td:contains(Technical Features) + td input:not(:disabled):visible',
+            onend: function () {
+                $('td:contains(Technical Features) + td input:not(:disabled):visible').attr("checked", true);
+                if (localStorage.getItem('active_step') === "2") {
+                    $('input').attr("checked", true);
+                    $('.oe_view_manager_body td:contains(Portal) + td input:visible').attr("checked", null);
+                    $('.oe_view_manager_body td:contains(Public) + td input:visible').attr("checked", null);
+                    $('select').each(function () {
+                        $('option:last', this).attr('selected', true);
+                    });
                 }
             },
-            {
-                title:    "add class already tested",
-                waitNot:  "body.oe_wait",
-                onload: function () {
-
-                    var tested = JSON.parse(localStorage.getItem('menu_tested') || "[]");
-
-                    $('.oe_application_menu_placeholder li.active [data-menu]').addClass('already_tested');
-
-                    var $menu = $('.oe_secondary_menus_container li.active [data-action-model]');
-                    var model = $menu.data('action-model');
-                    var id = $menu.data('action-id');
-                    var key = '.oe_secondary_menus_container li [data-action-model="'+model+'"][data-action-id="'+id+'"]';
-                    if (tested.indexOf(key) === -1) {
-                        tested.push(key);
-                    }
-
-                    var type = $('.oe_view_manager_switch li.active [data-view-type]').data('view-type');
-                    var key = 'body:has(.oe_secondary_menus_container li.active [data-action-model="' + model + '"][data-action-id="' + id + '"]) '+
-                        '.oe_view_manager_switch li [data-view-type="'+type+'"]';
-                    if (tested.indexOf(key) === -1) {
-                        tested.push(key);
-                    }
-                    localStorage.setItem('menu_tested', JSON.stringify(tested));
-
-
-                    $(tested.join(",")).addClass('already_tested');
-                    $(".oe_view_manager_body > *:visible:not(:empty), .oe_form_sheet").addClass("already_loaded");
-                    $('.oe_view_manager_switch li.active a').addClass('already_tested');
-                },
-                wait: 250, // delay to remove wrong-positive
-                onerror: function () {
-                    return "Select next action";
-                }
+        },
+        {
+            title:     "click on Save User",
+            waitFor:   'td:contains(Technical Features) + td input:checked:not(:disabled):visible',
+            element:   'button.oe_form_button_save',
+            onload: function () {
+                openmenu();
             },
-            {
-                title:    "Select next action",
-                onload: function () {
-                    if ($(".oe_error_detail").size()) {
-                        console.log("Tour 'test_menu' has detected an error.");
-                    }
-                    if ($(".oe_dialog_warning").size()) {
-                        console.log("Tour 'test_menu' has detected a warning.");
-                    }
+        },
 
-                    $('.modal').modal('hide').remove();
+        // log out
 
-                    var steps = ["Click on switch view", "Click on sub menu", "Click on need action", "Click on top menu"];
-                    for (var k in steps) {
-                        var step = openerp.Tour.search_step(steps[k]);
-                        if($(step.element).size()) {
-                            return step.id;
-                        }
-                    }
+        {
+            title:     "log out amdin",
+            waitFor:   'td:contains(Technical Features) + td input:disabled:visible',
+            element:   'a[data-menu="logout"]',
+        },
 
-                    openmenu();
-                },
+        // log as demo
+
+        {
+            title:     "log on as demo user",
+            element:    ".oe_login_form button",
+            onload: function () {
+                $('input[name="login"], input[name="password"]').val("demo");
             },
-
-            // log out and re try
-
-            {
-                title:     "log out",
-                element:   'a[data-menu="logout"]',
-                onend: function () {
-                    if (localStorage.getItem('active_step') == "1") {
-                        return "log on as admin";
-                    }
-                },
+        },
+        {
+            title:     "load web demo",
+            waitFor:   ".oe_view_manager_body",
+            onload: function () {
+                openmenu();
             },
+            next:       "check",
+        },
 
-            {
-                title:     "finish",
-                waitFor:   "form.oe_login_form",
-                onload: function () {
-                    localStorage.removeItem('active_step');
-                    localStorage.removeItem('menu_tested');
-                },
+        // click all menu items
+
+        {
+            title:     "Click on top menu",
+            element:   '.oe_application_menu_placeholder a[data-menu]:not([data-action-model="ir.actions.act_url"]):not(.already_tested):first',
+            onload: function () {
+                var $menu = $(this.element);
+                console.log("Tour 'test_menu' click on: '"+$menu.text().replace(/^\s+|\s+$/g, '')+"'");
+            },
+            onend: function () {
+                $(this.element).addClass('already_tested');
+                $('.oe_secondary_submenu').show();
+            },
+            next: "check"
+        },
+        {
+            title:     "Click on sub menu",
+            element:   '.oe_secondary_menu a:not(.oe_menu_toggler):visible:not(.already_tested):first',
+            onload: function () {
+                var $menu = $(this.element);
+                console.log("Tour 'test_menu' click on: '"+$menu.find('span:first').text().replace(/^\s+|\s+$/g, '')+"'");
+            },
+            onend: function () {
+                $(this.element).addClass('already_tested');
+            },
+            next: "check"
+        },
+        {
+            title:     "Click on need action",
+            element:   '.oe_secondary_menu a:not(.oe_menu_toggler) div.badge:visible:not(.already_tested):first',
+            onload: function () {
+                var $menu = $(this.element);
+                console.log("Tour 'test_menu' click on need action: '"+$menu.parent().find('span:first').text().replace(/^\s+|\s+$/g, '')+"'");
+            },
+            onend: function () {
+                $(this.element).addClass('already_tested');
+            },
+            next: "check"
+        },
+        {
+            title:     "Click on switch view",
+            element:   '.oe_view_manager_switch li a:not(.already_tested):first',
+            onload: function () {
+                var $menu = $(this.element);
+                console.log("Tour 'test_menu' click on switch view: '"+$menu.data('original-title')+"'");
+            },
+            onend: function () {
+                $(this.element).addClass('already_tested');
+            },
+            next: "check"
+        },
+
+        {
+            title:    "check",
+            waitNot:  "body:has("+
+                          ".oe_view_manager_body > *:visible:not(:empty).already_loaded:not(.oe_searchview_drawer_container), "+
+                          ".oe_form_sheetbg.already_loaded"+
+                      "):not(:has(.modal))",
+            wait: 100,
+            onerror: function () {
+                return "Select next action";
             }
-        ]
-    });
+        },
+        {
+            title:    "add class already tested",
+            waitNot:  "body.oe_wait",
+            onload: function () {
+
+                var tested = JSON.parse(localStorage.getItem('menu_tested') || "[]");
+
+                $('.oe_application_menu_placeholder li.active [data-menu]').addClass('already_tested');
+
+                var $menu = $('.oe_secondary_menus_container li.active [data-action-model]');
+                var model = $menu.data('action-model');
+                var id = $menu.data('action-id');
+                var key = '.oe_secondary_menus_container li [data-action-model="'+model+'"][data-action-id="'+id+'"]';
+                if (tested.indexOf(key) === -1) {
+                    tested.push(key);
+                }
+
+                var type = $('.oe_view_manager_switch li.active [data-view-type]').data('view-type');
+                var key = 'body:has(.oe_secondary_menus_container li.active [data-action-model="' + model + '"][data-action-id="' + id + '"]) '+
+                    '.oe_view_manager_switch li [data-view-type="'+type+'"]';
+                if (tested.indexOf(key) === -1) {
+                    tested.push(key);
+                }
+                localStorage.setItem('menu_tested', JSON.stringify(tested));
+
+
+                $(tested.join(",")).addClass('already_tested');
+                $(".oe_view_manager_body > *:visible:not(:empty), .oe_form_sheet").addClass("already_loaded");
+                $('.oe_view_manager_switch li.active a').addClass('already_tested');
+            },
+            wait: 250, // delay to remove wrong-positive
+            onerror: function () {
+                return "Select next action";
+            }
+        },
+        {
+            title:    "Select next action",
+            onload: function () {
+                if ($(".oe_error_detail").size()) {
+                    console.log("Tour 'test_menu' has detected an error.");
+                }
+                if ($(".oe_dialog_warning").size()) {
+                    console.log("Tour 'test_menu' has detected a warning.");
+                }
+
+                $('.modal').modal('hide').remove();
+
+                var steps = ["Click on switch view", "Click on sub menu", "Click on need action", "Click on top menu"];
+                for (var k in steps) {
+                    var step = openerp.Tour.search_step(steps[k]);
+                    if($(step.element).size()) {
+                        return step.id;
+                    }
+                }
+
+                openmenu();
+            },
+        },
+
+        // log out and re try
+
+        {
+            title:     "log out",
+            element:   'a[data-menu="logout"]',
+            onend: function () {
+                if (localStorage.getItem('active_step') == "1") {
+                    return "log on as admin";
+                }
+            },
+        },
+
+        {
+            title:     "finish",
+            waitFor:   "form.oe_login_form",
+            onload: function () {
+                localStorage.removeItem('active_step');
+                localStorage.removeItem('menu_tested');
+            },
+        }
+    ]
+});
 
 });
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index b6d933ebdf9..eb6bbc75f56 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -239,7 +239,7 @@
                                 <t t-raw="init"/>
                             </t>
                             <t t-if="not init">
-                                odoo.define('web.web_client', ['web.WebClient'], function (require) {
+                                odoo.define('web.web_client', function (require) {
                                     var WebClient = require('web.WebClient');
                                     var web_client = new WebClient();
                                     web_client.setElement($(document.body));
diff --git a/addons/web_analytics/static/src/js/web_analytics.js b/addons/web_analytics/static/src/js/web_analytics.js
index a81275d1b74..a778dc71709 100644
--- a/addons/web_analytics/static/src/js/web_analytics.js
+++ b/addons/web_analytics/static/src/js/web_analytics.js
@@ -1,7 +1,7 @@
 
 var _gaq = _gaq || [];  // asynchronous stack used by google analytics
 
-odoo.define('web_analytics.web_analytics', ['web.ActionManager', 'web.core', 'web.CrashManager', 'web.FormView', 'web.Session', 'web.session', 'web.View', 'web.web_client', 'web.WebClient'], function (require) {
+odoo.define('web_analytics.web_analytics', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 6377ee90ca6..466894c231c 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -1,4 +1,4 @@
-odoo.define('web_calendar.CalendarView', ['web.core', 'web.data', 'web.form_common', 'web.Model', 'web.time', 'web.View', 'web_calendar.widgets'], function (require) {
+odoo.define('web_calendar.CalendarView', function (require) {
 "use strict";
 /*---------------------------------------------------------
  * OpenERP web_calendar
diff --git a/addons/web_calendar/static/src/js/widgets.js b/addons/web_calendar/static/src/js/widgets.js
index 72afb373267..d38330043b5 100644
--- a/addons/web_calendar/static/src/js/widgets.js
+++ b/addons/web_calendar/static/src/js/widgets.js
@@ -1,4 +1,4 @@
-odoo.define('web_calendar.widgets', ['web.core', 'web.Dialog', 'web.form_common', 'web.Widget'], function(require) {
+odoo.define('web_calendar.widgets', function(require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 4e543a2a0b2..720bc1aa8f7 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -1,4 +1,4 @@
-odoo.define('web_diagram.DiagramView', ['web.core', 'web.data', 'web.form_common', 'web.View'], function (require) {
+odoo.define('web_diagram.DiagramView', function (require) {
 /*---------------------------------------------------------
  * OpenERP diagram library
  *---------------------------------------------------------*/
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index ce9bce91258..ed9a49fa8c1 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -1,4 +1,4 @@
-odoo.define('web_gantt.GanttView', ['web.core', 'web.form_common', 'web.formats', 'web.Model', 'web.time', 'web.View'], function (require) {
+odoo.define('web_gantt.GanttView', function (require) {
 "use strict";
 /*---------------------------------------------------------
  * Odoo web_gantt
diff --git a/addons/web_kanban/static/src/js/compatibility.js b/addons/web_kanban/static/src/js/compatibility.js
index acaef36a6d9..256086b9ef1 100644
--- a/addons/web_kanban/static/src/js/compatibility.js
+++ b/addons/web_kanban/static/src/js/compatibility.js
@@ -1,4 +1,4 @@
-odoo.define('web_kanban.compatibility', ['web_kanban.common', 'web_kanban.KanbanView'], function (require) {
+odoo.define('web_kanban.compatibility', function (require) {
 "use strict";
 
 var common = require('web_kanban.common');
diff --git a/addons/web_kanban/static/src/js/kanban_common.js b/addons/web_kanban/static/src/js/kanban_common.js
index 13648c3ae78..bcfb8105762 100644
--- a/addons/web_kanban/static/src/js/kanban_common.js
+++ b/addons/web_kanban/static/src/js/kanban_common.js
@@ -1,4 +1,4 @@
-odoo.define('web_kanban.common', ['web.core', 'web.data', 'web.form_common', 'web.formats', 'web.framework', 'web.pyeval', 'web.Registry', 'web.session', 'web.time', 'web.utils', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('web_kanban.common', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web_kanban/static/src/js/kanban_view.js b/addons/web_kanban/static/src/js/kanban_view.js
index 9ec00d08600..9b1cc76eca7 100644
--- a/addons/web_kanban/static/src/js/kanban_view.js
+++ b/addons/web_kanban/static/src/js/kanban_view.js
@@ -1,4 +1,4 @@
-odoo.define('web_kanban.KanbanView', ['web.core', 'web.data', 'web.Model', 'web.pyeval', 'web.session', 'web.utils', 'web.View', 'web_kanban.common'], function (require) {
+odoo.define('web_kanban.KanbanView', function (require) {
 "use strict";
 
 var core = require('web.core');
@@ -579,7 +579,7 @@ return KanbanView;
 });
 
 
-odoo.define(['web.core', 'web.data', 'web.web_client', 'web_kanban.common', 'web_kanban.KanbanView'], function (require) {
+odoo.define(function (require) {
 
 var core = require('web.core');
 var data = require('web.data');
diff --git a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
index 5af9f4adf08..7ffd021af4b 100644
--- a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
+++ b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
@@ -1,4 +1,4 @@
-odoo.define('web_kanban_gauge.widget', ['web.core', 'web_kanban.common'], function (require) {
+odoo.define('web_kanban_gauge.widget', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
index 1c48fa3bb32..ff569a3888c 100644
--- a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
+++ b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
@@ -1,4 +1,4 @@
-odoo.define(['web_kanban.common'], function (require) {
+odoo.define('web_kanban_sparkline.widget', function (require) {
 "use strict";
 
 var kanban_common = require('web_kanban.common');
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 80425afff29..736efc0a536 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -1,4 +1,4 @@
-odoo.define('web_linkedin.web_linkedin', ['web.core', 'web.data', 'web.Dialog', 'web.form_widgets', 'web.Model', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web_linkedin.web_linkedin', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js
index 9540b717d83..1da1af8a0b5 100644
--- a/addons/web_tests/static/src/js/web_tests.js
+++ b/addons/web_tests/static/src/js/web_tests.js
@@ -1,4 +1,4 @@
-odoo.define(['web.core', 'web.data', 'web.FormView', 'web.Widget'], function (require) {
+odoo.define('web_tests.web_tests', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web_tests_demo/static/src/js/demo.js b/addons/web_tests_demo/static/src/js/demo.js
index ccfb6d21c70..1a08e3ba171 100644
--- a/addons/web_tests_demo/static/src/js/demo.js
+++ b/addons/web_tests_demo/static/src/js/demo.js
@@ -1,4 +1,4 @@
-odoo.define('web_tests_demo.demo', ['web.core'], function (require) {
+odoo.define('web_tests_demo.demo', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web_tip/static/src/js/tip.js b/addons/web_tip/static/src/js/tip.js
index 450bbe9803b..8f8e7f15ff1 100644
--- a/addons/web_tip/static/src/js/tip.js
+++ b/addons/web_tip/static/src/js/tip.js
@@ -1,4 +1,4 @@
-odoo.define(['web.core', 'web.form_widgets', 'web.Model', 'web.utils', 'web.WebClient'], function (require) {
+odoo.define('web_tip.web_tip', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index f4a50b5b580..ac41cb953bd 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -1,4 +1,4 @@
-odoo.define(['web.ActionManager', 'web.core', 'web.data', 'web.Dialog', 'web.formats', 'web.Registry', 'web.session', 'web.utils', 'web.ViewManager', 'web.Widget'], function (require) {
+odoo.define('web_view_editor.view_editor', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');
diff --git a/addons/website/static/src/js/summernote.js b/addons/website/static/src/js/summernote.js
index 8f595685620..7fd6f7fbfe4 100644
--- a/addons/website/static/src/js/summernote.js
+++ b/addons/website/static/src/js/summernote.js
@@ -1,4 +1,4 @@
-odoo.define('website.summernote', ['web.core'], function (require) {
+odoo.define('website.summernote', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 587cf1f235f..aa724e819fb 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -1,4 +1,4 @@
-odoo.define('website.ace', ['web.ajax', 'web.Class', 'web.core', 'web.Widget', 'website.ace_call', 'website.website'], function (require) {
+odoo.define('website.ace', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website/static/src/js/website.backend.iframe.js b/addons/website/static/src/js/website.backend.iframe.js
index bcce2ab1404..925fb6aa4b1 100644
--- a/addons/website/static/src/js/website.backend.iframe.js
+++ b/addons/website/static/src/js/website.backend.iframe.js
@@ -1,4 +1,4 @@
-odoo.define('website.backend.iframe', ['website.editor', 'website.snippets.editor'], function (require) {
+odoo.define('website.backend.iframe', function (require) {
 'use strict';
 
 var editor = require('website.editor');
diff --git a/addons/website/static/src/js/website.backend.js b/addons/website/static/src/js/website.backend.js
index e7638938d6b..c88f866b489 100644
--- a/addons/website/static/src/js/website.backend.js
+++ b/addons/website/static/src/js/website.backend.js
@@ -1,4 +1,4 @@
-odoo.define('website.backend', ['web.core', 'web.form_common', 'web.form_widgets'], function (require) {
+odoo.define('website.backend', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js
index 3bc9b66cab1..f1d53af9c8d 100644
--- a/addons/website/static/src/js/website.contentMenu.js
+++ b/addons/website/static/src/js/website.contentMenu.js
@@ -1,4 +1,4 @@
-odoo.define('website.contentMenu', ['web.ajax', 'web.core', 'web.Widget', 'website.editor', 'website.website'], function (require) {
+odoo.define('website.contentMenu', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 047e3d797eb..7b300aebd7f 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website.editor', ['web.ajax', 'web.core', 'web.utils', 'web.Widget', 'website.website'], function (require) {
+odoo.define('website.editor', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index ff19545b687..340680c8d7c 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -1,4 +1,4 @@
-odoo.define('website.website', ['web.ajax', 'web.core', 'web.session'], function (require) {
+odoo.define('website.website', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
@@ -400,7 +400,7 @@ return {
 
 });
 
-odoo.define('web.session', ['web.Session'], function (require) {
+odoo.define('web.session', function (require) {
 "use strict";
 
 var Session = require('web.Session');
diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/website.mobile.js
index 1375d3181d5..517dcdbbe68 100644
--- a/addons/website/static/src/js/website.mobile.js
+++ b/addons/website/static/src/js/website.mobile.js
@@ -1,4 +1,4 @@
-odoo.define('website.mobile', ['web.Widget', 'website.website'], function (require) {
+odoo.define('website.mobile', function (require) {
 'use strict';
 
 var Widget = require('web.Widget');
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 373d6bda17a..5a848157493 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -1,4 +1,4 @@
-odoo.define('website.seo', ['web.Class', 'web.mixins', 'web.Model', 'web.Widget', 'website.website'], function (require) {
+odoo.define('website.seo', function (require) {
 'use strict';
 
 var Class = require('web.Class');
diff --git a/addons/website/static/src/js/website.share.js b/addons/website/static/src/js/website.share.js
index 3bfb794398f..3f4e0cf17a3 100644
--- a/addons/website/static/src/js/website.share.js
+++ b/addons/website/static/src/js/website.share.js
@@ -1,4 +1,4 @@
-odoo.define('website.share', ['web.core', 'web.Widget', 'website.website'], function (require) {
+odoo.define('website.share', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index f03dfee9d6a..177b30d0cb1 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -1,4 +1,4 @@
-odoo.define('website.snippets.animation', ['web.ajax', 'web.core', 'website.website'], function (require) {
+odoo.define('website.snippets.animation', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 9a8a4de5d7e..18ccea94cfd 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website.snippets.editor', ['web.ajax', 'web.Class', 'web.core', 'web.Widget', 'website.editor', 'website.snippets.animation', 'website.website'], function (require) {
+odoo.define('website.snippets.editor', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website/static/src/js/website.snippets.gallery.js b/addons/website/static/src/js/website.snippets.gallery.js
index ba68ff953ce..cd1918d4edf 100644
--- a/addons/website/static/src/js/website.snippets.gallery.js
+++ b/addons/website/static/src/js/website.snippets.gallery.js
@@ -1,4 +1,4 @@
-odoo.define('website.snippets.gallery', ['web.core', 'website.snippets.editor', 'website.website'], function (require) {
+odoo.define('website.snippets.gallery', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website/static/src/js/website.theme.js b/addons/website/static/src/js/website.theme.js
index 4fa123782a6..b3dcbc9b0b6 100644
--- a/addons/website/static/src/js/website.theme.js
+++ b/addons/website/static/src/js/website.theme.js
@@ -1,4 +1,4 @@
-odoo.define('website.theme', ['web.ajax', 'web.core', 'web.Widget', 'website.website'], function (require) {
+odoo.define('website.theme', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 56d3802ac35..70dd3c49bfa 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -1,4 +1,4 @@
-odoo.define('website.tour.banner', ['web.core', 'web.Tour', 'website.website'], function (require) {
+odoo.define('website.tour.banner', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 4af630a8b8d..c6a31b779e9 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -1,4 +1,4 @@
-odoo.define('website.tour', ['web.Tour', 'website.editor'], function (require) {
+odoo.define('website.tour', function (require) {
 'use strict';
 
 var Tour = require('web.Tour');
diff --git a/addons/website/static/src/js/website.tour.rte.js b/addons/website/static/src/js/website.tour.rte.js
index c13ebd7889a..6a50dc444c2 100644
--- a/addons/website/static/src/js/website.tour.rte.js
+++ b/addons/website/static/src/js/website.tour.rte.js
@@ -1,4 +1,4 @@
-odoo.define('website.tour.rte', ['web.core', 'web.Tour'], function (require) {
+odoo.define('website.tour.rte', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index f83db7ba30a..aa72fad210b 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -1,4 +1,4 @@
-odoo.define('website.translator', ['website.editor', 'website.website'], function (require) {
+odoo.define('website.translator', function (require) {
 'use strict';
 
 var editor = require('website.editor');
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index e302f798081..bcbf8bc0a04 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -1,4 +1,4 @@
-odoo.define('website_blog.tour', ['web.core', 'web.Tour', 'website.website'], function (require) {
+odoo.define('website_blog.tour', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js
index 62e9018c178..261760367ee 100644
--- a/addons/website_blog/static/src/js/website_blog.editor.js
+++ b/addons/website_blog/static/src/js/website_blog.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_blog.editor', ['web.ajax', 'web.core', 'web.Model', 'website.contentMenu', 'website.define', 'website.editor', 'website.snippets.editor', 'website.website'], function (require) {
+odoo.define('website_blog.editor', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_blog/static/src/js/website_blog.inline.discussion.js b/addons/website_blog/static/src/js/website_blog.inline.discussion.js
index 8a84f7eacc0..9da538bb0a6 100644
--- a/addons/website_blog/static/src/js/website_blog.inline.discussion.js
+++ b/addons/website_blog/static/src/js/website_blog.inline.discussion.js
@@ -1,4 +1,4 @@
-odoo.define('website_blog.InlineDiscussion', ['web.ajax', 'web.core', 'website.website'], function (require) {
+odoo.define('website_blog.InlineDiscussion', function (require) {
 'use strict';
 
 // Inspired from https://github.com/tsi/inlineDisqussions
diff --git a/addons/website_blog/static/src/js/website_blog.js b/addons/website_blog/static/src/js/website_blog.js
index 3c8f9606064..34fd94fd385 100644
--- a/addons/website_blog/static/src/js/website_blog.js
+++ b/addons/website_blog/static/src/js/website_blog.js
@@ -1,4 +1,4 @@
-odoo.define('website_blog.website_blog', ['web.ajax', 'website_blog.InlineDiscussion'], function (require) {
+odoo.define('website_blog.website_blog', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_crm_score/static/src/js/display_filters.js b/addons/website_crm_score/static/src/js/display_filters.js
index 13df745646f..d7817aa4dcf 100644
--- a/addons/website_crm_score/static/src/js/display_filters.js
+++ b/addons/website_crm_score/static/src/js/display_filters.js
@@ -1,4 +1,4 @@
-odoo.define('website_crm_score.filters', ['web_kanban.common'], function (require) {
+odoo.define('website_crm_score.filters', function (require) {
 "use strict";
 
 var common = require('web_kanban.common');
diff --git a/addons/website_crm_score/static/src/js/set_score.js b/addons/website_crm_score/static/src/js/set_score.js
index 06c150ed29e..29caf860250 100644
--- a/addons/website_crm_score/static/src/js/set_score.js
+++ b/addons/website_crm_score/static/src/js/set_score.js
@@ -1,4 +1,4 @@
-odoo.define('website_crm_score.set_score', ['web.Model', 'website.seo', 'website.website'], function (require) {
+odoo.define('website_crm_score.set_score', function (require) {
 "use strict";
 
 var Model = require('web.Model');
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index eb3422628f3..f2d9493ba07 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -1,4 +1,4 @@
-odoo.define('website_event.tour', ['web.core', 'web.Tour', 'website.website'], function (require) {
+odoo.define('website_event.tour', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_event/static/src/js/website_event.editor.js b/addons/website_event/static/src/js/website_event.editor.js
index ee8ae431062..3bec1afa8f1 100644
--- a/addons/website_event/static/src/js/website_event.editor.js
+++ b/addons/website_event/static/src/js/website_event.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_event.editor', ['web.core', 'website.contentMenu', 'website.website'], function (require) {
+odoo.define('website_event.editor', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/website_event/static/src/js/website_event.js b/addons/website_event/static/src/js/website_event.js
index afa37dff93d..3b2248742a9 100644
--- a/addons/website_event/static/src/js/website_event.js
+++ b/addons/website_event/static/src/js/website_event.js
@@ -1,4 +1,4 @@
-odoo.define('website_event.website_event', ['web.ajax'], function (require) {
+odoo.define('website_event.website_event', function (require) {
 
 var ajax = require('web.ajax');
 
diff --git a/addons/website_event/static/src/js/website_geolocation.js b/addons/website_event/static/src/js/website_geolocation.js
index c292ca40833..6223500aed7 100644
--- a/addons/website_event/static/src/js/website_geolocation.js
+++ b/addons/website_event/static/src/js/website_geolocation.js
@@ -1,4 +1,4 @@
-odoo.define('website_event.geolocation', ['website.snippets.animation'], function (require) {
+odoo.define('website_event.geolocation', function (require) {
 "use strict";
 
 var animation = require('website.snippets.animation');
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
index ab14ef41e82..fa109550dc4 100644
--- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -1,4 +1,4 @@
-odoo.define('website_event_sale.tour', ['web.Tour', 'website.website'], function (require) {
+odoo.define('website_event_sale.tour', function (require) {
 'use strict';
 
 var Tour = require('web.Tour');
diff --git a/addons/website_forum/static/src/js/website_forum.editor.js b/addons/website_forum/static/src/js/website_forum.editor.js
index 4779464451a..e1a9549dbac 100644
--- a/addons/website_forum/static/src/js/website_forum.editor.js
+++ b/addons/website_forum/static/src/js/website_forum.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_forum.editor', ['web.core', 'website.contentMenu', 'website.website'], function (require) {
+odoo.define('website_forum.editor', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 2f33d7a7643..c3abbd19a2e 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -1,4 +1,4 @@
-odoo.define('website_forum.website_forum', ['web.ajax', 'web.core', 'website.website'], function (require) {
+odoo.define('website_forum.website_forum', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_forum/static/src/js/website_forum.share.js b/addons/website_forum/static/src/js/website_forum.share.js
index 3a89d5395a3..710642a2949 100644
--- a/addons/website_forum/static/src/js/website_forum.share.js
+++ b/addons/website_forum/static/src/js/website_forum.share.js
@@ -1,4 +1,4 @@
-odoo.define('website_forum.share', ['web.ajax', 'web.core', 'website.share', 'website.website'], function (require) {
+odoo.define('website_forum.share', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_forum/static/src/js/website_tour_forum.js b/addons/website_forum/static/src/js/website_tour_forum.js
index 7b72ca3ec99..478f39aede3 100644
--- a/addons/website_forum/static/src/js/website_tour_forum.js
+++ b/addons/website_forum/static/src/js/website_tour_forum.js
@@ -1,4 +1,4 @@
-odoo.define('website_forum.tour_forum', ['web.core', 'web.Tour'], function (require) {
+odoo.define('website_forum.tour_forum', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_forum/static/src/js/website_tour_forum_question.js b/addons/website_forum/static/src/js/website_tour_forum_question.js
index 0787f4bd1e8..fe12a1a244c 100644
--- a/addons/website_forum/static/src/js/website_tour_forum_question.js
+++ b/addons/website_forum/static/src/js/website_tour_forum_question.js
@@ -1,4 +1,4 @@
-odoo.define('website_forum.tour_forum_question', ['web.Tour'], function (require) {
+odoo.define('website_forum.tour_forum_question', function (require) {
 'use strict';
 
 var Tour = require('web.Tour');
diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js
index 6a5bd75bb78..0c22f70e422 100644
--- a/addons/website_gengo/static/src/js/website_gengo.js
+++ b/addons/website_gengo/static/src/js/website_gengo.js
@@ -1,4 +1,4 @@
-odoo.define('website_gengo.website_gengo', ['web.ajax', 'web.core', 'web.Widget', 'website.editor', 'website.website'], function (require) {
+odoo.define('website_gengo.website_gengo', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js
index 55d8811de44..6d23e9dca27 100644
--- a/addons/website_links/static/src/js/website_links.js
+++ b/addons/website_links/static/src/js/website_links.js
@@ -1,4 +1,4 @@
-odoo.define('website_links.website_links', ['web.ajax', 'web.core', 'web.Widget', 'website.website'], function (require) {
+odoo.define('website_links.website_links', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_links/static/src/js/website_links_charts.js b/addons/website_links/static/src/js/website_links_charts.js
index 2adfbc1d637..474da0cba65 100644
--- a/addons/website_links/static/src/js/website_links_charts.js
+++ b/addons/website_links/static/src/js/website_links_charts.js
@@ -1,4 +1,4 @@
-odoo.define('website_links.charts', ['web.Widget', 'website.website'], function (require) {
+odoo.define('website_links.charts', function (require) {
 'use strict';
 
 var Widget = require('web.Widget');
diff --git a/addons/website_links/static/src/js/website_links_code_editor.js b/addons/website_links/static/src/js/website_links_code_editor.js
index 9ecefa7dd5a..ec36416c359 100644
--- a/addons/website_links/static/src/js/website_links_code_editor.js
+++ b/addons/website_links/static/src/js/website_links_code_editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_links.code_editor', ['web.ajax', 'website.website'], function (require) {
+odoo.define('website_links.code_editor', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_mail/static/src/js/follow.js b/addons/website_mail/static/src/js/follow.js
index 9a7f914edad..6b73d4156d3 100644
--- a/addons/website_mail/static/src/js/follow.js
+++ b/addons/website_mail/static/src/js/follow.js
@@ -1,4 +1,4 @@
-odoo.define('website_mail.follow', ['web.ajax', 'website.snippets.animation'], function (require) {
+odoo.define('website_mail.follow', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js
index ad8e7440b7d..beafd4a6b5e 100644
--- a/addons/website_mail/static/src/js/website_email_designer.js
+++ b/addons/website_mail/static/src/js/website_email_designer.js
@@ -1,4 +1,4 @@
-odoo.define('website_mail.website_mail', ['web.Model', 'website.editor', 'website.snippets.editor'], function (require) {
+odoo.define('website_mail.website_mail', function (require) {
 "use strict";
 
 var Model = require('web.Model');
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.editor.js b/addons/website_mail_group/static/src/js/website_mail_group.editor.js
index 1295818186e..ab3c2caa13a 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.editor.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_mail_group.editor', ['web.core', 'web.Model', 'website.snippets.editor', 'website.website'], function (require) {
+odoo.define('website_mail_group.editor', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
index 30f9e43f60c..8346e917693 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.js
@@ -1,4 +1,4 @@
-odoo.define('website_mail_group', ['web.ajax'], function (require) {
+odoo.define('website_mail_group', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
index 0cf1050c4d5..3211db69930 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
@@ -1,4 +1,4 @@
-odoo.define('website_mail_group.snippet', ['web.ajax', 'website.snippets.animation'], function (require) {
+odoo.define('website_mail_group.snippet', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_quote/static/src/js/website_quotation.js b/addons/website_quote/static/src/js/website_quotation.js
index 6e534893094..fe5f602d84f 100644
--- a/addons/website_quote/static/src/js/website_quotation.js
+++ b/addons/website_quote/static/src/js/website_quotation.js
@@ -1,4 +1,4 @@
-odoo.define('website_quote.website_quote', ['web.ajax', 'web.Widget', 'website.website'], function (require) {
+odoo.define('website_quote.website_quote', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js
index e5992e9664c..b7d69b8c257 100644
--- a/addons/website_sale/static/src/js/website_sale.editor.js
+++ b/addons/website_sale/static/src/js/website_sale.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.editor', ['web.ajax', 'web.core', 'web.Model', 'website.contentMenu', 'website.snippets.editor', 'website.website'], function (require) {
+odoo.define('website_sale.editor', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 3bbf3a4dbbe..b7dc3320089 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.website_sale', ['web.ajax'], function (require) {
+odoo.define('website_sale.website_sale', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_sale/static/src/js/website_sale_payment.js b/addons/website_sale/static/src/js/website_sale_payment.js
index 6cbf0048c52..4653dbcae17 100644
--- a/addons/website_sale/static/src/js/website_sale_payment.js
+++ b/addons/website_sale/static/src/js/website_sale_payment.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.payment', ['web.ajax'], function (require) {
+odoo.define('website_sale.payment', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_sale/static/src/js/website_sale_tour_buy.js b/addons/website_sale/static/src/js/website_sale_tour_buy.js
index 74e0f653005..38212847fdb 100644
--- a/addons/website_sale/static/src/js/website_sale_tour_buy.js
+++ b/addons/website_sale/static/src/js/website_sale_tour_buy.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.tour', ['web.Tour'], function (require) {
+odoo.define('website_sale.tour', function (require) {
 'use strict';
 
 var Tour = require('web.Tour');
diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop.js b/addons/website_sale/static/src/js/website_sale_tour_shop.js
index 0af26b69b37..3655af43f60 100644
--- a/addons/website_sale/static/src/js/website_sale_tour_shop.js
+++ b/addons/website_sale/static/src/js/website_sale_tour_shop.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.tour_shop', ['web.core', 'web.Tour', 'website.website'], function (require) {
+odoo.define('website_sale.tour_shop', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_sale/static/src/js/website_sale_validate.js b/addons/website_sale/static/src/js/website_sale_validate.js
index 17b9f45a3f7..dce80543dc3 100644
--- a/addons/website_sale/static/src/js/website_sale_validate.js
+++ b/addons/website_sale/static/src/js/website_sale_validate.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.validate', ['web.ajax'], function(require) {
+odoo.define('website_sale.validate', function(require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_sale_options/static/src/js/website_sale.js b/addons/website_sale_options/static/src/js/website_sale.js
index 20d2231c004..d1fc617cc70 100644
--- a/addons/website_sale_options/static/src/js/website_sale.js
+++ b/addons/website_sale_options/static/src/js/website_sale.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.website_sale', ['web.ajax', 'website.website'], function(require) {
+odoo.define('website_sale.website_sale', function(require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_sale_options/static/src/js/website_sale.test.js b/addons/website_sale_options/static/src/js/website_sale.test.js
index e7d63e23401..dfe62a9a4d7 100644
--- a/addons/website_sale_options/static/src/js/website_sale.test.js
+++ b/addons/website_sale_options/static/src/js/website_sale.test.js
@@ -1,4 +1,4 @@
-odoo.define('website_sale.test', ['web.core', 'web.Tour'], function (require) {
+odoo.define('website_sale.test', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_slides/static/src/js/slides.js b/addons/website_slides/static/src/js/slides.js
index 00b89aaa940..fe46ed826b0 100644
--- a/addons/website_slides/static/src/js/slides.js
+++ b/addons/website_slides/static/src/js/slides.js
@@ -1,5 +1,5 @@
 /*global $, _, PDFJS */
-odoo.define('website_slides.slides', ['web.ajax', 'web.core', 'web.time', 'web.Widget'], function (require) {
+odoo.define('website_slides.slides', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_slides/static/src/js/slides_embed.js b/addons/website_slides/static/src/js/slides_embed.js
index 3184780e691..3bcc508d19f 100644
--- a/addons/website_slides/static/src/js/slides_embed.js
+++ b/addons/website_slides/static/src/js/slides_embed.js
@@ -1,5 +1,5 @@
 /*global $, _, PDFSlidesViewer*/
-odoo.define('website_slides.slides_embed', [], function (require) {
+odoo.define('website_slides.slides_embed', function (require) {
 
 
 /**
diff --git a/addons/website_slides/static/src/js/slides_upload.js b/addons/website_slides/static/src/js/slides_upload.js
index 90c962c2cba..2cece16ca91 100644
--- a/addons/website_slides/static/src/js/slides_upload.js
+++ b/addons/website_slides/static/src/js/slides_upload.js
@@ -1,5 +1,5 @@
 /*global $, _, PDFJS */
-odoo.define('website_slides.upload', ['web.ajax', 'web.core', 'web.Widget', 'website.website', 'website_slides.slides'], function (require) {
+odoo.define('website_slides.upload', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
diff --git a/addons/website_twitter/static/src/js/website.twitter.animation.js b/addons/website_twitter/static/src/js/website.twitter.animation.js
index 15affa3ef9b..4142f454c8b 100644
--- a/addons/website_twitter/static/src/js/website.twitter.animation.js
+++ b/addons/website_twitter/static/src/js/website.twitter.animation.js
@@ -1,4 +1,4 @@
-odoo.define('website_twitter.animation', ['web.ajax', 'web.core', 'website.snippets.animation'], function (require) {
+odoo.define('website_twitter.animation', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_twitter/static/src/js/website.twitter.editor.js b/addons/website_twitter/static/src/js/website.twitter.editor.js
index 5569950d710..21b5fa3465a 100644
--- a/addons/website_twitter/static/src/js/website.twitter.editor.js
+++ b/addons/website_twitter/static/src/js/website.twitter.editor.js
@@ -1,4 +1,4 @@
-odoo.define('website_twitter.editor', ['web.ajax', 'web.core', 'website.snippets.editor'], function (require) {
+odoo.define('website_twitter.editor', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_version/static/src/js/edit_version.js b/addons/website_version/static/src/js/edit_version.js
index 5cb427619c3..cbe3846f500 100644
--- a/addons/website_version/static/src/js/edit_version.js
+++ b/addons/website_version/static/src/js/edit_version.js
@@ -1,4 +1,4 @@
-odoo.define('website_version.edit', ['web.ajax', 'web.core', 'website.editor'], function (require) {
+odoo.define('website_version.edit', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_version/static/src/js/menu_version.js b/addons/website_version/static/src/js/menu_version.js
index c6c9ecbec2e..6c12d3f221c 100644
--- a/addons/website_version/static/src/js/menu_version.js
+++ b/addons/website_version/static/src/js/menu_version.js
@@ -1,4 +1,4 @@
-odoo.define('website_version.menu_version', ['web.ajax', 'web.core', 'web.Widget', 'website.website'], function (require) {
+odoo.define('website_version.menu_version', function (require) {
 'use strict';
 
 var ajax = require('web.ajax');
diff --git a/addons/website_version/static/src/js/website_version.tour.versioning.js b/addons/website_version/static/src/js/website_version.tour.versioning.js
index 5fef5a11df0..a02da2ebcab 100644
--- a/addons/website_version/static/src/js/website_version.tour.versioning.js
+++ b/addons/website_version/static/src/js/website_version.tour.versioning.js
@@ -1,4 +1,4 @@
-odoo.define('website_version.tour', ['web.core', 'web.Tour'], function (require) {
+odoo.define('website_version.tour', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_version/static/src/js/widget.js b/addons/website_version/static/src/js/widget.js
index f682b2052f6..d9fb6d8e5f4 100644
--- a/addons/website_version/static/src/js/widget.js
+++ b/addons/website_version/static/src/js/widget.js
@@ -1,4 +1,4 @@
-odoo.define('website_version.widget', ['web.core','web.form_common', 'web.framework', 'web.pyeval'], function (require) {
+odoo.define('website_version.widget', function (require) {
 "use strict";
 
 var core = require('web.core');
diff --git a/openerp/addons/base/static/src/js/apps.js b/openerp/addons/base/static/src/js/apps.js
index bd697384c3b..b73c06aa576 100644
--- a/openerp/addons/base/static/src/js/apps.js
+++ b/openerp/addons/base/static/src/js/apps.js
@@ -1,4 +1,4 @@
-odoo.define('base.apps', ['web.core', 'web.framework', 'web.Model', 'web.session', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('base.apps', function (require) {
 "use strict";
 
 var core = require('web.core');