diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index b8778ab98f..c81a88c771 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -596,8 +596,8 @@ if FROZEN:
     else:
         raise ValueError('Unknown layout')
 
+    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/wire/thp/*.py'))
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/wire/*.py'))
-    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/wire/thp*.py'))
 
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'storage/*.py',
         exclude=[
diff --git a/core/SConscript.unix b/core/SConscript.unix
index 54cd2d3d7e..89b0c0d472 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -680,9 +680,9 @@ if FROZEN:
         ))
     else:
         raise ValueError('Unknown layout')
-
-    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/wire/*.py'))
+        
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/wire/thp/*.py'))
+    SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/wire/*.py'))
 
     SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'storage/*.py',
         exclude=[
diff --git a/core/src/all_modules.py b/core/src/all_modules.py
index f6dbdaa889..c7deb897db 100644
--- a/core/src/all_modules.py
+++ b/core/src/all_modules.py
@@ -207,6 +207,8 @@ trezor.wire.protocol
 import trezor.wire.protocol
 trezor.wire.protocol_common
 import trezor.wire.protocol_common
+trezor.wire.thp
+import trezor.wire.thp
 trezor.wire.thp.ack_handler
 import trezor.wire.thp.ack_handler
 trezor.wire.thp.channel_context