diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 7baac5d67c4..26016f3f0a1 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -4,28 +4,25 @@ import simplejson
 import werkzeug.urls
 import werkzeug.utils
 
-import openerp.modules.registry
-import openerp.addons.web.controllers.main
-import openerp.addons.web.common.http as openerpweb
-from openerp import SUPERUSER_ID
+import openerp
 
 _logger = logging.getLogger(__name__)
 
-class OAuthController(openerpweb.Controller):
+class OAuthController(openerp.addons.web.http.Controller):
     _cp_path = '/auth_oauth'
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def list_providers(self, req, dbname):
         try:
             registry = openerp.modules.registry.RegistryManager.get(dbname)
             with registry.cursor() as cr:
                 providers = registry.get('auth.oauth.provider')
-                l = providers.read(cr, SUPERUSER_ID, providers.search(cr, SUPERUSER_ID, [('enabled','=',True)]))
+                l = providers.read(cr, openerp.SUPERUSER_ID, providers.search(cr, openerp.SUPERUSER_ID, [('enabled','=',True)]))
         except Exception:
             l = []
         return l
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def signin(self, req, **kw):
         state = simplejson.loads(kw['state'])
         dbname = state['d']
@@ -34,7 +31,7 @@ class OAuthController(openerpweb.Controller):
         with registry.cursor() as cr:
             try:
                 u = registry.get('res.users')
-                credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw)
+                credentials = u.auth_oauth(cr, openerp.SUPERUSER_ID, provider, kw)
                 cr.commit()
                 return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
             except AttributeError:
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index ebcaab4bf25..7ee562d4d29 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -23,24 +23,21 @@ import logging
 import os
 import tempfile
 import urllib
-from openerp import SUPERUSER_ID
 
 import werkzeug.urls
 import werkzeug.exceptions
 
-from openerp.modules.registry import RegistryManager
-from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
-try:
-    import openerp.addons.web.common.http as openerpweb
-except ImportError:
-    import web.common.http as openerpweb    # noqa
-
 from openid import oidutil
 from openid.store import filestore
 from openid.consumer import consumer
 from openid.cryptutil import randomString
 from openid.extensions import ax, sreg
 
+import openerp
+from openerp import SUPERUSER_ID
+from openerp.modules.registry import RegistryManager
+from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
+
 from .. import utils
 
 _logger = logging.getLogger(__name__)
@@ -70,7 +67,7 @@ class GoogleAppsAwareConsumer(consumer.GenericConsumer):
         return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to)
 
 
-class OpenIDController(openerpweb.Controller):
+class OpenIDController(openerp.addons.web.http.Controller):
     _cp_path = '/auth_openid/login'
 
     _store = filestore.FileOpenIDStore(_storedir)
@@ -118,7 +115,7 @@ class OpenIDController(openerpweb.Controller):
     def _get_realm(self, req):
         return req.httprequest.host_url
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def verify_direct(self, req, db, url):
         result = self._verify(req, db, url)
         if 'error' in result:
@@ -127,7 +124,7 @@ class OpenIDController(openerpweb.Controller):
             return werkzeug.utils.redirect(result['value'])
         return result['value']
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def verify(self, req, db, url):
         return self._verify(req, db, url)
 
@@ -157,7 +154,7 @@ class OpenIDController(openerpweb.Controller):
             form_html = request.htmlMarkup(realm, redirect_to)
             return {'action': 'post', 'value': form_html, 'session_id': req.session_id}
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def process(self, req, **kw):
         session = getattr(req.session, 'openid_session', None)
         if not session:
@@ -225,7 +222,7 @@ class OpenIDController(openerpweb.Controller):
 
         return set_cookie_and_redirect(req, '/#action=login&loginerror=1')
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def status(self, req):
         session = getattr(req.session, 'openid_session', {})
         return {'status': session.get('status'), 'message': session.get('message')}
diff --git a/addons/auth_reset_password/controllers/main.py b/addons/auth_reset_password/controllers/main.py
index 5185a65c3ce..639945cfc09 100644
--- a/addons/auth_reset_password/controllers/main.py
+++ b/addons/auth_reset_password/controllers/main.py
@@ -18,20 +18,20 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-
-from openerp import SUPERUSER_ID
-from openerp.modules.registry import RegistryManager
-import openerp.addons.web.common.http as openerpweb
+import logging
 
 import werkzeug
 
-import logging
+import openerp
+from openerp import SUPERUSER_ID
+from openerp.modules.registry import RegistryManager
+
 _logger = logging.getLogger(__name__)
 
-class Controller(openerpweb.Controller):
+class Controller(openerp.addons.web.http.Controller):
     _cp_path = '/auth_reset_password'
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def reset_password(self, req, dbname, login):
         """ retrieve user, and perform reset password """
         url = '/'
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 56e5e910212..cf72e581049 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -18,31 +18,30 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-
-from openerp import SUPERUSER_ID
-from openerp.modules.registry import RegistryManager
-from openerp.addons.web.controllers.main import login_and_redirect
-import openerp.addons.web.common.http as openerpweb
+import logging
 
 import werkzeug
 
-import logging
+import openerp
+from openerp.modules.registry import RegistryManager
+from openerp.addons.web.controllers.main import login_and_redirect
+
 _logger = logging.getLogger(__name__)
 
-class Controller(openerpweb.Controller):
+class Controller(openerp.addons.web.http.Controller):
     _cp_path = '/auth_signup'
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def retrieve(self, req, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
         registry = RegistryManager.get(dbname)
         user_info = None
         with registry.cursor() as cr:
             res_partner = registry.get('res.partner')
-            user_info = res_partner.signup_retrieve_info(cr, SUPERUSER_ID, token)
+            user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
         return user_info
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def signup(self, req, dbname, token, name, login, password):
         """ sign up a user (new or existing), and log it in """
         url = '/'
@@ -51,7 +50,7 @@ class Controller(openerpweb.Controller):
             try:
                 res_users = registry.get('res.users')
                 values = {'name': name, 'login': login, 'password': password}
-                credentials = res_users.signup(cr, SUPERUSER_ID, values, token)
+                credentials = res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
                 cr.commit()
                 return login_and_redirect(req, *credentials)
             except Exception as e:
diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
index 85ff993e92e..c831ffd229d 100644
--- a/addons/base_import/controllers.py
+++ b/addons/base_import/controllers.py
@@ -1,15 +1,12 @@
 # -*- coding: utf-8 -*-
 import simplejson
 
-try:
-    import openerp.addons.web.common.http as openerpweb
-except ImportError:
-    import web.common.http as openerpweb
+import openerp
 
-class ImportController(openerpweb.Controller):
+class ImportController(openerp.addons.web.http.Controller):
     _cp_path = '/base_import'
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def set_file(self, req, file, import_id, jsonp='callback'):
         import_id = int(import_id)
 
diff --git a/addons/board/controllers.py b/addons/board/controllers.py
index 53845c96095..81557f64fa3 100644
--- a/addons/board/controllers.py
+++ b/addons/board/controllers.py
@@ -1,19 +1,14 @@
 # -*- coding: utf-8 -*-
 from xml.etree import ElementTree
 
-try:
-    import openerp.addons.web.common.http as openerpweb
-    from openerp.addons.web.common import nonliterals
-    from openerp.addons.web.controllers.main import load_actions_from_ir_values
-except ImportError:
-    import web.common.http as openerpweb    # noqa
-    from web.common import nonliterals      # noqa
-    from web.controllers.main import load_actions_from_ir_values    # noqa
+import openerp
+from openerp.addons.web import nonliterals
+from openerp.addons.web.controllers.main import load_actions_from_ir_values
 
-class Board(openerpweb.Controller):
+class Board(openerp.addons.web.http.Controller):
     _cp_path = '/board'
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
         # FIXME move this method to board.board model
         to_eval = nonliterals.CompoundContext(context_to_save)
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 3d80fd53e24..b189c8f204a 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -4,16 +4,12 @@ import simplejson
 import os
 import openerp
 
-try:
-    import openerp.addons.web.common.http as openerpweb
-    from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
-except ImportError:
-    import web.common.http as openerpweb
+from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
 
-class PointOfSaleController(openerpweb.Controller):
+class PointOfSaleController(openerp.addons.web.http.Controller):
     _cp_path = '/pos'
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def app(self, req, s_action=None, **kw):
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js'))
         css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css'))
@@ -29,7 +25,7 @@ class PointOfSaleController(openerpweb.Controller):
         }
         return r
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def manifest(self, req, **kwargs):
         """ This generates a HTML5 cache manifest files that preloads the categories and products thumbnails 
             and other ressources necessary for the point of sale to work offline """
@@ -66,12 +62,12 @@ class PointOfSaleController(openerpweb.Controller):
 
         return m
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def dispatch(self, request, iface, **kwargs):
         method = 'iface_%s' % iface
         return getattr(self, method)(request, **kwargs)
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def scan_item_success(self, request, ean):
         """
         A product has been scanned with success
@@ -79,7 +75,7 @@ class PointOfSaleController(openerpweb.Controller):
         print 'scan_item_success: ' + str(ean)
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def scan_item_error_unrecognized(self, request, ean):
         """
         A product has been scanned without success
@@ -87,7 +83,7 @@ class PointOfSaleController(openerpweb.Controller):
         print 'scan_item_error_unrecognized: ' + str(ean)
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def help_needed(self, request):
         """
         The user wants an help (ex: light is on)
@@ -95,7 +91,7 @@ class PointOfSaleController(openerpweb.Controller):
         print "help_needed"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def help_canceled(self, request):
         """
         The user stops the help request
@@ -103,22 +99,22 @@ class PointOfSaleController(openerpweb.Controller):
         print "help_canceled"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def weighting_start(self, request):
         print "weighting_start"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def weighting_read_kg(self, request):
         print "weighting_read_kg"
         return 0.0
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def weighting_end(self, request):
         print "weighting_end"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def payment_request(self, request, price):
         """
         The PoS will activate the method payment 
@@ -126,47 +122,47 @@ class PointOfSaleController(openerpweb.Controller):
         print "payment_request: price:"+str(price)
         return 'ok'
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def payment_status(self, request):
         print "payment_status"
         return { 'status':'waiting' } 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def payment_cancel(self, request):
         print "payment_cancel"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def transaction_start(self, request):
         print 'transaction_start'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def transaction_end(self, request):
         print 'transaction_end'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def cashier_mode_activated(self, request):
         print 'cashier_mode_activated'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def cashier_mode_deactivated(self, request):
         print 'cashier_mode_deactivated'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def open_cashbox(self, request):
         print 'open_cashbox'
         return
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def print_receipt(self, request, receipt):
         print 'print_receipt' + str(receipt)
         return
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def print_pdf_invoice(self, request, pdfinvoice):
         print 'print_pdf_invoice' + str(pdfinvoice)
         return
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index ea94329f8b1..71865c7fcc1 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -19,21 +19,16 @@
 #
 ##############################################################################
 
-try:
-    # embedded
-    import openerp.addons.web.common.http as openerpweb
-except ImportError:
-    # standalone
-    import web.common.http as openerpweb
-
 import base64
 import urllib2
+
+import openerp
 from osv import osv, fields
 
-class Binary(openerpweb.Controller):
+class Binary(openerp.addons.web.http.Controller):
     _cp_path = "/web_linkedin/binary"
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def url2binary(self, req,url):
         bfile = urllib2.urlopen(url)
         return base64.b64encode(bfile.read())
diff --git a/addons/web_shortcuts/controllers/main.py b/addons/web_shortcuts/controllers/main.py
index 23f4bbd3fbe..2cdf232ac0f 100644
--- a/addons/web_shortcuts/controllers/main.py
+++ b/addons/web_shortcuts/controllers/main.py
@@ -1,16 +1,9 @@
-try:
-    # embedded
-    import openerp.addons.web.common.http as openerpweb
-    import openerp.addons.web.controllers.main as webmain
-except ImportError:
-    # standalone
-    import web.common.http as openerpweb
-    import web.controllers.main as webmain
+import openerp
 
-class Shortcuts(openerpweb.Controller):
+class Shortcuts(openerp.addons.web.http.Controller):
     _cp_path = "/web/shortcuts"
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def list(self, req):
         return req.session.model('ir.ui.view_sc').get_sc(
             req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))