diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index 7cea7b3afd6..da7bb8e308d 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -28,12 +28,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
-import pooler
-import netsvc
-import time
-from xml import dom
-
+from openerp.osv import fields, osv
 
 CODE_EXEC_DEFAULT = '''\
 res = []
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
index abf0385be86..0cfbc040d82 100644
--- a/addons/account_test/report/account_test_report.py
+++ b/addons/account_test/report/account_test_report.py
@@ -22,8 +22,10 @@
 
 import datetime
 import time
-from report import report_sxw
+
+from openerp.report import report_sxw
 from openerp.tools.translate import _
+
 #
 # Use period and Journal for selection or resources
 #
diff --git a/addons/base_action_rule/test_models.py b/addons/base_action_rule/test_models.py
index 9469b42c705..bc76be05f4a 100644
--- a/addons/base_action_rule/test_models.py
+++ b/addons/base_action_rule/test_models.py
@@ -1,4 +1,4 @@
-from osv import osv, fields
+from openerp.osv import fields, osv
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 2c008abe02f..90b42fd8b5f 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -35,6 +35,7 @@
 
 
 import logging
+import openerp
 from openerp import netsvc
 from dav_fs import openerp_dav_handler
 from openerp.tools.config import config
@@ -56,7 +57,6 @@ import urllib
 import re
 import time
 from string import atoi
-import addons
 import socket
 # from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
 from xml.dom import minidom
@@ -609,7 +609,7 @@ try:
             if base_path and base_path == '/':
                 dir_path = config.get_misc('static-http', 'dir_path', False)
             else:
-                dir_path = addons.get_module_resource('document_webdav','public_html')
+                dir_path = openerp.addons.get_module_resource('document_webdav','public_html')
                 # an _ugly_ hack: we put that dir back in tools.config.misc, so that
                 # the StaticHttpHandler can find its dir_path.
                 config.misc.setdefault('static-http',{})['dir_path'] = dir_path
diff --git a/addons/l10n_si/account_wizard.py b/addons/l10n_si/account_wizard.py
index 6f5abc2af88..0b0ae6e7ec9 100644
--- a/addons/l10n_si/account_wizard.py
+++ b/addons/l10n_si/account_wizard.py
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-import tools
-from osv import osv
-import addons
+from openerp.osv import osv
 
 class AccountWizard_cd(osv.osv_memory):
 	_inherit='wizard.multi.charts.accounts'
@@ -30,5 +28,3 @@ class AccountWizard_cd(osv.osv_memory):
         'code_digits' : 6,
 	}
 
-AccountWizard_cd()
-