diff --git a/artiq/coredevice/analyzer.py b/artiq/coredevice/analyzer.py
index 778a3750b..08fab8b86 100644
--- a/artiq/coredevice/analyzer.py
+++ b/artiq/coredevice/analyzer.py
@@ -4,7 +4,7 @@ from itertools import count
 import struct
 import logging
 
-from artiq.gateware.rtio.analyzer_common import MessageType, ExceptionType
+from artiq.protocols.analyzer import MessageType, ExceptionType
 
 
 logger = logging.getLogger(__name__)
diff --git a/artiq/gateware/rtio/analyzer.py b/artiq/gateware/rtio/analyzer.py
index e2e196543..22eac2e35 100644
--- a/artiq/gateware/rtio/analyzer.py
+++ b/artiq/gateware/rtio/analyzer.py
@@ -3,7 +3,7 @@ from migen.genlib.record import Record, layout_len
 from misoc.interconnect.csr import *
 from misoc.interconnect import stream
 
-from artiq.gateware.rtio.analyzer_common import MessageType, ExceptionType
+from artiq.protocols.analyzer import MessageType, ExceptionType
 
 
 __all__ = ["Analyzer"]
diff --git a/artiq/gateware/rtio/analyzer_common.py b/artiq/protocols/analyzer.py
similarity index 100%
rename from artiq/gateware/rtio/analyzer_common.py
rename to artiq/protocols/analyzer.py