diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 1f926fcba..6b139850d 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -598,6 +598,7 @@ 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 + 'storage/*.py',
diff --git a/core/SConscript.unix b/core/SConscript.unix
index 90fe0df53..112be304f 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -682,6 +682,7 @@ 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 + 'storage/*.py',
diff --git a/core/src/all_modules.py b/core/src/all_modules.py
index f6dbdaa88..c7deb897d 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
diff --git a/core/src/trezor/wire/thp/__init__.py b/core/src/trezor/wire/thp/__init__.py
new file mode 100644
index 000000000..e69de29bb