diff --git a/pycolmap/estimators/absolute_pose.h b/pycolmap/estimators/absolute_pose.h
index f2601f3..7e5c333 100644
--- a/pycolmap/estimators/absolute_pose.h
+++ b/pycolmap/estimators/absolute_pose.h
@@ -1,5 +1,3 @@
-// Authors: Mihai-Dusmanu (mihaidusmanu), Paul-Edouard Sarlin (skydes)
-
 #include "colmap/estimators/pose.h"
 #include "colmap/geometry/rigid3.h"
 #include "colmap/math/random.h"
diff --git a/pycolmap/estimators/alignment.h b/pycolmap/estimators/alignment.h
index 45dd5af..3ef06fe 100644
--- a/pycolmap/estimators/alignment.h
+++ b/pycolmap/estimators/alignment.h
@@ -1,15 +1,7 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #include "colmap/estimators/alignment.h"
-#include "colmap/estimators/similarity_transform.h"
 #include "colmap/exe/model.h"
 #include "colmap/geometry/sim3.h"
-#include "colmap/optim/loransac.h"
 #include "colmap/scene/reconstruction.h"
-#include "colmap/sensor/models.h"
-#include "colmap/util/misc.h"
-#include "colmap/util/ply.h"
-#include "colmap/util/types.h"
 
 #include "pycolmap/log_exceptions.h"
 
diff --git a/pycolmap/estimators/essential_matrix.h b/pycolmap/estimators/essential_matrix.h
index 032f5f6..ff6300c 100644
--- a/pycolmap/estimators/essential_matrix.h
+++ b/pycolmap/estimators/essential_matrix.h
@@ -1,8 +1,6 @@
-// Authors: Mihai-Dusmanu (mihaidusmanu), Paul-Edouard Sarlin (skydes)
-
 #include "colmap/estimators/essential_matrix.h"
 #include "colmap/geometry/essential_matrix.h"
-#include "colmap/geometry/pose.h"
+#include "colmap/geometry/rigid3.h"
 #include "colmap/math/random.h"
 #include "colmap/optim/loransac.h"
 #include "colmap/scene/camera.h"
diff --git a/pycolmap/estimators/fundamental_matrix.h b/pycolmap/estimators/fundamental_matrix.h
index 91cf14b..d550a63 100644
--- a/pycolmap/estimators/fundamental_matrix.h
+++ b/pycolmap/estimators/fundamental_matrix.h
@@ -1,5 +1,3 @@
-// Authors: Mihai-Dusmanu (mihaidusmanu), Paul-Edouard Sarlin (skydes)
-
 #include "colmap/estimators/fundamental_matrix.h"
 #include "colmap/math/random.h"
 #include "colmap/optim/loransac.h"
diff --git a/pycolmap/estimators/generalized_absolute_pose.h b/pycolmap/estimators/generalized_absolute_pose.h
index 5cf438b..4d2e1ca 100644
--- a/pycolmap/estimators/generalized_absolute_pose.h
+++ b/pycolmap/estimators/generalized_absolute_pose.h
@@ -1,12 +1,9 @@
-// Authors: Mihai-Dusmanu (mihaidusmanu), Paul-Edouard Sarlin (skydes)
-
 #include "colmap/estimators/generalized_pose.h"
 #include "colmap/estimators/pose.h"
-#include "colmap/geometry/pose.h"
+#include "colmap/geometry/rigid3.h"
 #include "colmap/math/random.h"
 #include "colmap/optim/ransac.h"
 #include "colmap/scene/camera.h"
-#include "colmap/util/misc.h"
 
 #include "pycolmap/log_exceptions.h"
 #include "pycolmap/utils.h"
diff --git a/pycolmap/estimators/homography_matrix.h b/pycolmap/estimators/homography_matrix.h
index f1db8a2..83223ca 100644
--- a/pycolmap/estimators/homography_matrix.h
+++ b/pycolmap/estimators/homography_matrix.h
@@ -1,5 +1,3 @@
-// Authors: John Lambert (johnwlambert), Paul-Edouard Sarlin (skydes)
-
 #include "colmap/estimators/homography_matrix.h"
 #include "colmap/math/random.h"
 #include "colmap/optim/loransac.h"
diff --git a/pycolmap/estimators/triangulation.h b/pycolmap/estimators/triangulation.h
index d608dbd..cad87de 100644
--- a/pycolmap/estimators/triangulation.h
+++ b/pycolmap/estimators/triangulation.h
@@ -1,4 +1,6 @@
 #include "colmap/estimators/triangulation.h"
+#include "colmap/scene/camera.h"
+#include "colmap/scene/image.h"
 
 #include "pycolmap/helpers.h"
 #include "pycolmap/log_exceptions.h"
diff --git a/pycolmap/estimators/two_view_geometry.h b/pycolmap/estimators/two_view_geometry.h
index c168d22..a1438b6 100644
--- a/pycolmap/estimators/two_view_geometry.h
+++ b/pycolmap/estimators/two_view_geometry.h
@@ -1,10 +1,5 @@
-// Authors: John Lambert (johnwlambert), Paul-Edouard Sarlin (skydes)
-
 #include "colmap/estimators/two_view_geometry.h"
 #include "colmap/estimators/utils.h"
-#include "colmap/geometry/pose.h"
-#include "colmap/math/random.h"
-#include "colmap/optim/loransac.h"
 #include "colmap/scene/camera.h"
 #include "colmap/scene/two_view_geometry.h"
 
diff --git a/pycolmap/geometry/homography_matrix.h b/pycolmap/geometry/homography_matrix.h
index 64c50aa..a03a5e9 100644
--- a/pycolmap/geometry/homography_matrix.h
+++ b/pycolmap/geometry/homography_matrix.h
@@ -1,5 +1,3 @@
-// Author: Adi Singh (adisingh50)
-
 #include "colmap/geometry/homography_matrix.h"
 
 #include "pycolmap/log_exceptions.h"
diff --git a/pycolmap/helpers.h b/pycolmap/helpers.h
index c726a95..0cbb0c2 100644
--- a/pycolmap/helpers.h
+++ b/pycolmap/helpers.h
@@ -1,5 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #pragma once
 
 #include "colmap/util/string.h"
diff --git a/pycolmap/log_exceptions.h b/pycolmap/log_exceptions.h
index 16afa08..7d5e685 100644
--- a/pycolmap/log_exceptions.h
+++ b/pycolmap/log_exceptions.h
@@ -1,5 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #pragma once
 #include "colmap/util/misc.h"
 
diff --git a/pycolmap/pipeline/extract_features.h b/pycolmap/pipeline/extract_features.h
index 13eba7e..2d3ca68 100644
--- a/pycolmap/pipeline/extract_features.h
+++ b/pycolmap/pipeline/extract_features.h
@@ -1,14 +1,8 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #include "colmap/controllers/feature_extraction.h"
-#include "colmap/controllers/feature_matching.h"
 #include "colmap/controllers/image_reader.h"
-#include "colmap/controllers/incremental_mapper.h"
 #include "colmap/exe/feature.h"
 #include "colmap/exe/sfm.h"
 #include "colmap/feature/sift.h"
-#include "colmap/scene/reconstruction.h"
-#include "colmap/sensor/models.h"
 #include "colmap/util/misc.h"
 
 #include "pycolmap/helpers.h"
diff --git a/pycolmap/pipeline/images.h b/pycolmap/pipeline/images.h
index 48a192f..08ca53c 100644
--- a/pycolmap/pipeline/images.h
+++ b/pycolmap/pipeline/images.h
@@ -1,15 +1,9 @@
-// Author: Paul-Edouard Sarlin (skydes)
-
-#include "colmap/controllers/feature_extraction.h"
-#include "colmap/controllers/feature_matching.h"
 #include "colmap/controllers/image_reader.h"
-#include "colmap/controllers/incremental_mapper.h"
 #include "colmap/exe/feature.h"
-#include "colmap/exe/sfm.h"
 #include "colmap/feature/sift.h"
 #include "colmap/image/undistortion.h"
+#include "colmap/scene/camera.h"
 #include "colmap/scene/reconstruction.h"
-#include "colmap/sensor/models.h"
 #include "colmap/util/misc.h"
 
 #include "pycolmap/helpers.h"
diff --git a/pycolmap/pipeline/match_features.h b/pycolmap/pipeline/match_features.h
index f825c10..c9a8d1d 100644
--- a/pycolmap/pipeline/match_features.h
+++ b/pycolmap/pipeline/match_features.h
@@ -1,14 +1,8 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
-#include "colmap/controllers/feature_extraction.h"
 #include "colmap/controllers/feature_matching.h"
-#include "colmap/controllers/image_reader.h"
-#include "colmap/controllers/incremental_mapper.h"
 #include "colmap/estimators/two_view_geometry.h"
 #include "colmap/exe/feature.h"
 #include "colmap/exe/sfm.h"
 #include "colmap/feature/sift.h"
-#include "colmap/util/misc.h"
 
 #include "pycolmap/helpers.h"
 #include "pycolmap/log_exceptions.h"
diff --git a/pycolmap/pipeline/meshing.h b/pycolmap/pipeline/meshing.h
index 8be1dff..b3826b0 100644
--- a/pycolmap/pipeline/meshing.h
+++ b/pycolmap/pipeline/meshing.h
@@ -1,4 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
 #include "colmap/mvs/meshing.h"
 
 #include "pycolmap/helpers.h"
diff --git a/pycolmap/pipeline/mvs.h b/pycolmap/pipeline/mvs.h
index d38d566..bac78df 100644
--- a/pycolmap/pipeline/mvs.h
+++ b/pycolmap/pipeline/mvs.h
@@ -1,14 +1,5 @@
-#include "colmap/controllers/feature_extraction.h"
-#include "colmap/controllers/feature_matching.h"
-#include "colmap/controllers/image_reader.h"
-#include "colmap/controllers/incremental_mapper.h"
-#include "colmap/exe/feature.h"
-#include "colmap/exe/sfm.h"
-#include "colmap/feature/sift.h"
 #include "colmap/mvs/fusion.h"
-#include "colmap/mvs/meshing.h"
 #include "colmap/scene/reconstruction.h"
-#include "colmap/sensor/models.h"
 #include "colmap/util/misc.h"
 
 #ifdef COLMAP_CUDA_ENABLED
@@ -249,7 +240,6 @@ void BindMVS(py::module& m) {
           .def_readwrite("bounding_box",
                          &SFOpts::bounding_box,
                          "Bounding box Tuple[min, max]");
-
   MakeDataclass(PyStereoFusionOptions);
   auto stereo_fusion_options = PyStereoFusionOptions().cast<SFOpts>();
 
diff --git a/pycolmap/pipeline/sfm.h b/pycolmap/pipeline/sfm.h
index d76ee31..3a29cae 100644
--- a/pycolmap/pipeline/sfm.h
+++ b/pycolmap/pipeline/sfm.h
@@ -1,4 +1,3 @@
-// Author: Paul-Edouard Sarlin (skydes)
 #include "colmap/controllers/bundle_adjustment.h"
 #include "colmap/controllers/incremental_mapper.h"
 #include "colmap/exe/sfm.h"
diff --git a/pycolmap/scene/camera.h b/pycolmap/scene/camera.h
index d682d3c..338adec 100644
--- a/pycolmap/scene/camera.h
+++ b/pycolmap/scene/camera.h
@@ -1,5 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #include "colmap/scene/camera.h"
 #include "colmap/sensor/models.h"
 #include "colmap/util/misc.h"
diff --git a/pycolmap/scene/correspondence_graph.h b/pycolmap/scene/correspondence_graph.h
index 2fd6818..d7a32e5 100644
--- a/pycolmap/scene/correspondence_graph.h
+++ b/pycolmap/scene/correspondence_graph.h
@@ -1,5 +1,3 @@
-// Author: Mihai Dusmanu (mihaidusmanu)
-
 #include "colmap/feature/types.h"
 #include "colmap/scene/correspondence_graph.h"
 #include "colmap/util/types.h"
diff --git a/pycolmap/scene/image.h b/pycolmap/scene/image.h
index 68ece34..f54368a 100644
--- a/pycolmap/scene/image.h
+++ b/pycolmap/scene/image.h
@@ -1,5 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #include "colmap/geometry/rigid3.h"
 #include "colmap/scene/image.h"
 #include "colmap/util/misc.h"
diff --git a/pycolmap/scene/point2D.h b/pycolmap/scene/point2D.h
index 5d4595f..97917cf 100644
--- a/pycolmap/scene/point2D.h
+++ b/pycolmap/scene/point2D.h
@@ -1,6 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
-// Use Eigens aligned allocator for vectors
 #include "colmap/scene/point2d.h"
 #include "colmap/util/misc.h"
 #include "colmap/util/types.h"
diff --git a/pycolmap/scene/point3D.h b/pycolmap/scene/point3D.h
index 97df736..acf4fd5 100644
--- a/pycolmap/scene/point3D.h
+++ b/pycolmap/scene/point3D.h
@@ -1,5 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #include "colmap/scene/point3d.h"
 #include "colmap/util/misc.h"
 #include "colmap/util/types.h"
diff --git a/pycolmap/scene/reconstruction.h b/pycolmap/scene/reconstruction.h
index 54b8d92..a3a08c9 100644
--- a/pycolmap/scene/reconstruction.h
+++ b/pycolmap/scene/reconstruction.h
@@ -1,4 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
 #include "colmap/scene/reconstruction.h"
 #include "colmap/sensor/models.h"
 #include "colmap/util/misc.h"
diff --git a/pycolmap/scene/track.h b/pycolmap/scene/track.h
index 04b57b7..f60ff48 100644
--- a/pycolmap/scene/track.h
+++ b/pycolmap/scene/track.h
@@ -1,5 +1,3 @@
-// Author: Philipp Lindenberger (Phil26AT)
-
 #include "colmap/scene/track.h"
 #include "colmap/util/misc.h"
 #include "colmap/util/types.h"
diff --git a/pycolmap/sfm/incremental_triangulator.h b/pycolmap/sfm/incremental_triangulator.h
index 4d98777..f13fc10 100644
--- a/pycolmap/sfm/incremental_triangulator.h
+++ b/pycolmap/sfm/incremental_triangulator.h
@@ -1,5 +1,3 @@
-// Author: Mihai Dusmanu (mihaidusmanu)
-
 #include "colmap/sfm/incremental_triangulator.h"
 
 #include "pycolmap/helpers.h"