diff --git a/src/iceberg/type_fwd.h b/src/iceberg/type_fwd.h
index 0135422c1..09d836e8e 100644
--- a/src/iceberg/type_fwd.h
+++ b/src/iceberg/type_fwd.h
@@ -115,8 +115,11 @@ enum class SnapshotRefType;
 enum class TransformType;
 
 class Expression;
+class Literal;
 
+class DataTableScan;
 class FileScanTask;
+class ScanTask;
 class TableScan;
 class TableScanBuilder;
 
@@ -125,18 +128,17 @@ struct ManifestEntry;
 struct ManifestFile;
 struct ManifestList;
 
-class ManifestReader;
 class ManifestListReader;
+class ManifestListWriter;
+class ManifestReader;
+class ManifestWriter;
 
-/// ----------------------------------------------------------------------------
-/// TODO: Forward declarations below are not added yet.
-/// ----------------------------------------------------------------------------
+class Reader;
+class Writer;
 
 class StructLike;
-
 class MetadataUpdate;
 class UpdateRequirement;
-
 class AppendFiles;
 
 }  // namespace iceberg