diff --git a/pysollib/app.py b/pysollib/app.py
index 0dc2270d..8843f5ef 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -44,7 +44,7 @@ from pysollib.gamedb import GI, GAME_DB, loadGame
 from pysollib.options import Options
 from pysollib.settings import TOP_SIZE, TOOLKIT
 from pysollib.settings import DEBUG
-from winsystems import TkSettings
+from pysollib.winsystems import TkSettings
 
 # Toolkit imports
 from pysollib.pysoltk import wm_withdraw, loadImage
diff --git a/pysollib/main.py b/pysollib/main.py
index e4b23080..271ffe07 100644
--- a/pysollib/main.py
+++ b/pysollib/main.py
@@ -36,7 +36,7 @@ from pysollib.gamedb import GAME_DB
 from pysollib.pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient
 from pysollib.pysolaudio import Win32AudioClient, OSSAudioClient, PyGameAudioClient
 from pysollib.settings import TITLE, SOUND_MOD
-from winsystems import init_root_window
+from pysollib.winsystems import init_root_window
 
 # Toolkit imports
 from pysollib.pysoltk import loadImage
diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py
index 323883d9..3e1fc3d2 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.app', 'pysollib.acard', 'pysollib.actions', 'pysollib.customgame', 'pysollib.help', 'pysollib.hint', 'pysollib.images', 'pysollib.main', 'pysollib.layout', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.options', 'pysollib.pysolrandom', 'pysollib.resource', 'pysollib.settings', 'pysollib.stack', 'pysollib.stats', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', 'pysollib.gamedb', 'pysollib.configobj.configobj', 'pysollib.configobj.validate', 'pysollib.game', 'pysollib.pysoltk', 'pysollib.pysolaudio', 'pysollib.wizardutil', ]:
+for module_name in ['pysollib.app', 'pysollib.acard', 'pysollib.actions', 'pysollib.customgame', 'pysollib.help', 'pysollib.hint', 'pysollib.images', 'pysollib.main', 'pysollib.layout', 'pysollib.mfxutil', 'pysollib.move', 'pysollib.options', 'pysollib.pysolrandom', 'pysollib.resource', 'pysollib.settings', 'pysollib.stack', 'pysollib.stats', 'pysollib.mygettext', 'pysollib.wizardpresets', 'pysollib.util', 'pysollib.gamedb', 'pysollib.configobj.configobj', 'pysollib.configobj.validate', 'pysollib.game', 'pysollib.pysoltk', 'pysollib.pysolaudio', 'pysollib.wizardutil', 'pysollib.winsystems.aqua', 'pysollib.winsystems.common', 'pysollib.winsystems.x11', 'pysollib.winsystems.win32', ]:
     open(os.path.join(".", "tests", "individually-importing", "import_" + module_name + ".py"), 'w').write('''#!/usr/bin/env python
 import sys
 sys.path.append("./tests/lib")