diff --git a/product/ERP5/Tool/ConversionTool.py b/product/ERP5/Tool/ConversionTool.py
index fb36be41d2d9ae2bdb73efd0ac7e5789c6adbe74..a17b9ea1bf497c7f70b02073ab26cda45957f567 100644
--- a/product/ERP5/Tool/ConversionTool.py
+++ b/product/ERP5/Tool/ConversionTool.py
@@ -27,12 +27,10 @@
 #
 ##############################################################################
 
-from Products.CMFCore.utils import getToolByName
-
 from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, DTMLFile
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type import Permissions
+from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 
 from Products.ERP5 import _dtmldir
diff --git a/product/ERP5/Tool/SolverProcessTool.py b/product/ERP5/Tool/SolverProcessTool.py
index 3ff7e45e848a8b186b8fe31f9b4d42e347dd3daf..87243210841b1f7891d3dca4611b3a0d6eef7b4e 100644
--- a/product/ERP5/Tool/SolverProcessTool.py
+++ b/product/ERP5/Tool/SolverProcessTool.py
@@ -30,8 +30,8 @@
 import zope.interface
 
 from AccessControl import ClassSecurityInfo
-from Globals import DTMLFile
 from Products.ERP5Type import Permissions, interfaces
+from Products.ERP5Type.Globals import DTMLFile
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 
 from Products.ERP5 import _dtmldir
diff --git a/product/ERP5Security/ERP5KeyAuthPlugin.py b/product/ERP5Security/ERP5KeyAuthPlugin.py
index d5e025ecd308416357fde7639f3fa16be594730e..f6d1a04e526fd18a316a542ac342c51090b9fc0e 100644
--- a/product/ERP5Security/ERP5KeyAuthPlugin.py
+++ b/product/ERP5Security/ERP5KeyAuthPlugin.py
@@ -31,7 +31,7 @@ from base64 import encodestring, decodestring
 from urllib import quote, unquote
 from DateTime import DateTime
 from zLOG import LOG, PROBLEM
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 try:
     from zope.interface import Interface
 except ImportError:
diff --git a/product/ERP5Type/help/001-overview.stx b/product/ERP5Type/help/001-overview.stx
index e22764394d4b4161965e3f60954fb39f1c8c076e..c245abaea7d33a8aebf07e55151b4f8cf4a88830 100644
--- a/product/ERP5Type/help/001-overview.stx
+++ b/product/ERP5Type/help/001-overview.stx
@@ -323,7 +323,7 @@ Code Generation in ERP5Type
     If we look at the file Document/__init__.py, we can see some generated code::
 
       # Hide internal implementation
-      from Globals import InitializeClass
+      from Products.ERP5Type.Globals import InitializeClass
       from Demo import Demo as ERP5Demo
       # Default constructor for Demo
       # Can be overriden by adding a method addDemo in class Demo
diff --git a/product/ERP5Type/mixin/property_translatable.py b/product/ERP5Type/mixin/property_translatable.py
index 4fcffcc7fd74b1d1cceda6873f47e9aac0c1df1e..80fe975628cb19a7e13bf9305399b10432bbb611 100644
--- a/product/ERP5Type/mixin/property_translatable.py
+++ b/product/ERP5Type/mixin/property_translatable.py
@@ -29,7 +29,7 @@ import zope.interface
 from Products.ERP5Type.interfaces.property_translatable import IPropertyTranslatable
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 
 
 INTERNAL_TRANSLATION_DICT_NAME = '__translation_dict'
diff --git a/product/ERP5Wizard/PAS/ERP5RemoteUserManager.py b/product/ERP5Wizard/PAS/ERP5RemoteUserManager.py
index 046e48a4fbef169d5b2c547d74b72cd8f5a4842f..f302b4c1722d1910b427c54316731ccb34a61430 100644
--- a/product/ERP5Wizard/PAS/ERP5RemoteUserManager.py
+++ b/product/ERP5Wizard/PAS/ERP5RemoteUserManager.py
@@ -15,7 +15,7 @@
 """ Classes: ERP5RemoteUserManager
 """
 
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager,\
     setSecurityManager, newSecurityManager
diff --git a/product/ERP5Wizard/Tool/WizardTool.py b/product/ERP5Wizard/Tool/WizardTool.py
index 4c2c226ed5091bf4dfc6b1fe67d566747ee3b224..07fbed0f236ea97799652a88a17e1243e7237a37 100644
--- a/product/ERP5Wizard/Tool/WizardTool.py
+++ b/product/ERP5Wizard/Tool/WizardTool.py
@@ -29,7 +29,7 @@
 
 from AccessControl import ClassSecurityInfo
 from ZPublisher.HTTPRequest import FileUpload
-from Globals import DTMLFile
+from Products.ERP5Type.Globals import DTMLFile
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as \
     ConstantGetter
 from Products.ERP5Type.Tool.BaseTool import BaseTool
diff --git a/product/ERP5eGovSecurity/EGOVGroupManager.py b/product/ERP5eGovSecurity/EGOVGroupManager.py
index 2dae6e4fb376eda9cbf85068963d8234723bccd2..b09e490bc1c4cef07975bfcbf3468ea9576c8c2f 100644
--- a/product/ERP5eGovSecurity/EGOVGroupManager.py
+++ b/product/ERP5eGovSecurity/EGOVGroupManager.py
@@ -17,7 +17,7 @@
 """ Classes: ERP5GroupManager
 """
 
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 from AccessControl.SecurityManagement import newSecurityManager,\
     getSecurityManager, setSecurityManager
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
diff --git a/product/ERP5eGovSecurity/EGOVUserManager.py b/product/ERP5eGovSecurity/EGOVUserManager.py
index 3eedfef4c00346b1a61cf2b0ce522d82ca679fed..e24cbfe7229d65ac87663349817f9a2574548755 100644
--- a/product/ERP5eGovSecurity/EGOVUserManager.py
+++ b/product/ERP5eGovSecurity/EGOVUserManager.py
@@ -17,7 +17,7 @@
 """ Classes: ERP5GroupManager
 """
 
-from Globals import InitializeClass
+from Products.ERP5Type.Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager,\
     setSecurityManager, newSecurityManager