diff --git a/src/nitypes/waveform/__init__.py b/src/nitypes/waveform/__init__.py
index 2b681653..5efb2fe5 100644
--- a/src/nitypes/waveform/__init__.py
+++ b/src/nitypes/waveform/__init__.py
@@ -11,9 +11,7 @@
     NoneScaleMode,
     ScaleMode,
 )
-from nitypes.waveform._timing._base import BaseTiming, SampleIntervalMode
-from nitypes.waveform._timing._precision import PrecisionTiming
-from nitypes.waveform._timing._standard import Timing
+from nitypes.waveform._timing import BaseTiming, PrecisionTiming, SampleIntervalMode, Timing
 
 __all__ = [
     "AnalogWaveform",
diff --git a/src/nitypes/waveform/_analog_waveform.py b/src/nitypes/waveform/_analog_waveform.py
index b7c6f912..eb5bbdd1 100644
--- a/src/nitypes/waveform/_analog_waveform.py
+++ b/src/nitypes/waveform/_analog_waveform.py
@@ -14,9 +14,7 @@
     ExtendedPropertyDictionary,
 )
 from nitypes.waveform._scaling import NO_SCALING, ScaleMode
-from nitypes.waveform._timing._conversion import convert_timing
-from nitypes.waveform._timing._precision import PrecisionTiming
-from nitypes.waveform._timing._standard import Timing
+from nitypes.waveform._timing import PrecisionTiming, Timing, convert_timing
 
 if sys.version_info < (3, 10):
     import array as std_array
diff --git a/src/nitypes/waveform/_timing/__init__.py b/src/nitypes/waveform/_timing/__init__.py
index 527b989b..9695898e 100644
--- a/src/nitypes/waveform/_timing/__init__.py
+++ b/src/nitypes/waveform/_timing/__init__.py
@@ -1 +1,8 @@
 """Waveform timing data types for NI Python APIs."""
+
+from nitypes.waveform._timing._base import BaseTiming, SampleIntervalMode
+from nitypes.waveform._timing._conversion import convert_timing
+from nitypes.waveform._timing._precision import PrecisionTiming
+from nitypes.waveform._timing._standard import Timing
+
+__all__ = ["BaseTiming", "convert_timing", "PrecisionTiming", "SampleIntervalMode", "Timing"]
diff --git a/tests/unit/waveform/_timing/test_conversion.py b/tests/unit/waveform/_timing/test_conversion.py
index 90120f6b..7b7dcf40 100644
--- a/tests/unit/waveform/_timing/test_conversion.py
+++ b/tests/unit/waveform/_timing/test_conversion.py
@@ -6,7 +6,7 @@
 import hightime as ht
 
 from nitypes.waveform import PrecisionTiming, SampleIntervalMode, Timing
-from nitypes.waveform._timing._conversion import convert_timing
+from nitypes.waveform._timing import convert_timing
 
 if sys.version_info >= (3, 11):
     from typing import assert_type