diff --git a/pysollib/app.py b/pysollib/app.py
index 2f986cdb..8ca6f8ed 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -32,7 +32,7 @@ from pysollib.mfxutil import pickle, unpickle, UnpicklingError
 from pysollib.mfxutil import getusername, getprefdir
 from pysollib.mfxutil import latin1_to_ascii, print_err
 from pysollib.mfxutil import USE_PIL
-from util import CARDSET, IMAGE_EXTENSIONS
+from pysollib.util import CARDSET, IMAGE_EXTENSIONS
 from pysollib.settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
 from pysollib.resource import CSI, CardsetConfig, Cardset, CardsetManager
 from pysollib.resource import Tile, TileManager
diff --git a/pysollib/customgame.py b/pysollib/customgame.py
index 9f49f581..8df3cea7 100644
--- a/pysollib/customgame.py
+++ b/pysollib/customgame.py
@@ -22,7 +22,7 @@
 ##---------------------------------------------------------------------------##
 
 from gamedb import registerGame, GameInfo, GI
-from util import *
+from pysollib.util import *
 from stack import *
 from game import Game
 from layout import Layout
diff --git a/pysollib/hint.py b/pysollib/hint.py
index 65ef0a85..15ee28c5 100644
--- a/pysollib/hint.py
+++ b/pysollib/hint.py
@@ -31,7 +31,7 @@ import re
 # PySol imports
 from pysollib.settings import DEBUG, FCS_COMMAND
 from pysollib.mfxutil import destruct
-from util import KING
+from pysollib.util import KING
 
 
 # ************************************************************************
diff --git a/pysollib/main.py b/pysollib/main.py
index c16d2e94..f1cf3355 100644
--- a/pysollib/main.py
+++ b/pysollib/main.py
@@ -28,7 +28,7 @@ import traceback
 import getopt
 
 # PySol imports
-from util import DataLoader
+from pysollib.util import DataLoader
 from pysollib.mfxutil import print_err
 from pysollib.resource import Tile
 from app import Application
diff --git a/pysollib/stack.py b/pysollib/stack.py
index 13d4a159..6e3e1bb8 100644
--- a/pysollib/stack.py
+++ b/pysollib/stack.py
@@ -98,8 +98,8 @@ import types
 # PySol imports
 from pysollib.mfxutil import Struct, kwdefault, SubclassResponsibility
 from pysollib.mfxutil import Image, ImageTk, USE_PIL
-from util import ACE, KING
-from util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK
+from pysollib.util import ACE, KING
+from pysollib.util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK
 from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
 from pysoltk import CURSOR_DRAG, CURSOR_DOWN_ARROW
 from pysoltk import ANCHOR_NW, ANCHOR_SE
diff --git a/pysollib/util.py b/pysollib/util.py
index 03a71b0f..0c01765b 100644
--- a/pysollib/util.py
+++ b/pysollib/util.py
@@ -52,6 +52,7 @@ import sys, os
 from pysollib.settings import DATA_DIRS, TOOLKIT
 from pysollib.mfxutil import Image
 
+from pysollib.mygettext import _, n_
 
 # ************************************************************************
 # * constants
diff --git a/pysollib/wizardutil.py b/pysollib/wizardutil.py
index fa75083f..e4ba2471 100644
--- a/pysollib/wizardutil.py
+++ b/pysollib/wizardutil.py
@@ -24,7 +24,7 @@
 import os
 
 from gamedb import GI, loadGame
-from util import *
+from pysollib.util import *
 from stack import *
 from layout import Layout
 from wizardpresets import presets
diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py
index 0f967a9a..f99c6f7c 100644
--- a/scripts/gen_individual_importing_tests.py
+++ b/scripts/gen_individual_importing_tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import os.path
-for module_name in ['pysollib.mfxutil', 'pysollib.move', 'pysollib.resource', 'pysollib.settings', 'pysollib.mygettext', 'pysollib.wizardpresets',]:
+for module_name in ['pysollib.mfxutil', 'pysollib.move', 'pysollib.resource', 'pysollib.settings', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', ]:
     open(os.path.join(".", "tests", "individually-importing", "import_" + module_name + ".py"), 'w').write('''#!/usr/bin/env python
 import sys
 sys.path.append("./tests/lib")