diff --git a/pysollib/customgame.py b/pysollib/customgame.py
index 92dfcfe0..7627fa48 100644
--- a/pysollib/customgame.py
+++ b/pysollib/customgame.py
@@ -23,7 +23,7 @@
 
 from pysollib.gamedb import registerGame, GameInfo, GI
 from pysollib.util import *
-from stack import *
+from pysollib.stack import *
 from game import Game
 from layout import Layout
 from hint import AbstractHint, DefaultHint, CautiousDefaultHint, Yukon_Hint
diff --git a/pysollib/game.py b/pysollib/game.py
index 4b6faf50..674706ea 100644
--- a/pysollib/game.py
+++ b/pysollib/game.py
@@ -254,7 +254,7 @@ class Game:
                           '%s: %s %s' % (class_name, ncards, self.gameinfo.ncards),
                           2)
         if self.s.rows:
-            from stack import AC_RowStack, UD_AC_RowStack, \
+            from pysollib.stack import AC_RowStack, UD_AC_RowStack, \
                  SS_RowStack, UD_SS_RowStack, \
                  RK_RowStack, UD_RK_RowStack, \
                  Spider_AC_RowStack, Spider_SS_RowStack
@@ -3304,7 +3304,7 @@ in the current implementation.''') % version)
 
     def showStackDesc(self):
         from pysoltk import StackDesc
-        from stack import InitialDealTalonStack
+        from pysollib.stack import InitialDealTalonStack
         sd_list = []
         for s in self.allstacks:
             sd = (s.__class__.__name__, s.cap.base_rank, s.cap.dir)
diff --git a/pysollib/stack.py b/pysollib/stack.py
index 6e3e1bb8..71822abd 100644
--- a/pysollib/stack.py
+++ b/pysollib/stack.py
@@ -95,6 +95,7 @@ __all__ = ['cardsFaceUp',
 # imports
 import types
 
+from pysollib.mygettext import _, n_
 # PySol imports
 from pysollib.mfxutil import Struct, kwdefault, SubclassResponsibility
 from pysollib.mfxutil import Image, ImageTk, USE_PIL
diff --git a/pysollib/tile/tkconst.py b/pysollib/tile/tkconst.py
index 7170cc15..e844ccee 100644
--- a/pysollib/tile/tkconst.py
+++ b/pysollib/tile/tkconst.py
@@ -41,6 +41,7 @@ __all__ = ['EVENT_HANDLED',
 # imports
 import Tkinter
 
+from pysollib.mygettext import _, n_
 
 # ************************************************************************
 # * constants
diff --git a/pysollib/wizardutil.py b/pysollib/wizardutil.py
index fc01ecc9..7167e9f6 100644
--- a/pysollib/wizardutil.py
+++ b/pysollib/wizardutil.py
@@ -25,7 +25,7 @@ import os
 
 from pysollib.gamedb import GI, loadGame
 from pysollib.util import *
-from stack import *
+from pysollib.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 b38c51ee..a2cfd24e 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.acard', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.resource', 'pysollib.settings', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', 'pysollib.gamedb', ]:
+for module_name in ['pysollib.acard', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.resource', 'pysollib.settings', 'pysollib.stack', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', 'pysollib.gamedb', ]:
     open(os.path.join(".", "tests", "individually-importing", "import_" + module_name + ".py"), 'w').write('''#!/usr/bin/env python
 import sys
 sys.path.append("./tests/lib")