diff --git a/ctapipe/calib/camera/__init__.py b/ctapipe/calib/camera/__init__.py
index b71a6d469c8..b5b41267892 100644
--- a/ctapipe/calib/camera/__init__.py
+++ b/ctapipe/calib/camera/__init__.py
@@ -6,9 +6,7 @@
 from .calibrator import CameraCalibrator  # noqa: F401
 from .gainselection import GainSelector  # noqa: F401
 
-# __all__ = [
-#     "CameraCalibrator",
-#     "GainSelector",
-# ]
-
-__all__ = []
+__all__ = [
+    # "CameraCalibrator",
+    # "GainSelector",
+]
diff --git a/ctapipe/instrument/camera/__init__.py b/ctapipe/instrument/camera/__init__.py
index 43a0644f6f9..e64c4e0db10 100644
--- a/ctapipe/instrument/camera/__init__.py
+++ b/ctapipe/instrument/camera/__init__.py
@@ -2,11 +2,11 @@
 from .geometry import CameraGeometry, PixelShape, UnknownPixelShapeWarning  # noqa: F401
 from .readout import CameraReadout  # noqa: F401
 
-# __all__ = [
-#     "CameraDescription",
-#     "CameraGeometry",
-#     "PixelShape",
-#     "UnknownPixelShapeWarning",
-#     "CameraReadout",
-# ]
-__all__ = []
+# commented out due to sphinx issue with classes being defined in 3 places
+__all__ = [
+    # "CameraDescription",
+    # "CameraGeometry",
+    # "PixelShape",
+    # "UnknownPixelShapeWarning",
+    # "CameraReadout",
+]