diff --git a/src/LibraryInfo.cc b/src/LibraryInfo.cc
index c4fdb08d18b..1c235fcce83 100644
--- a/src/LibraryInfo.cc
+++ b/src/LibraryInfo.cc
@@ -1,4 +1,5 @@
 #include "LibraryInfo.h"
+#include <sstream>
 #include <glib.h>
 #include <string>
 #include <vector>
diff --git a/src/RenderStatistic.cc b/src/RenderStatistic.cc
index 6e2018ae1b0..2ea7f612bc5 100644
--- a/src/RenderStatistic.cc
+++ b/src/RenderStatistic.cc
@@ -24,6 +24,7 @@
  */
 
 
+#include <iostream>
 #include <memory>
 #include <fstream>
 #include "json/json.hpp"
diff --git a/src/core/AST.cc b/src/core/AST.cc
index 56710fc6e1d..32d6fbd907b 100644
--- a/src/core/AST.cc
+++ b/src/core/AST.cc
@@ -1,4 +1,5 @@
 #include "core/AST.h"
+#include <ostream>
 #include <memory>
 #include <sstream>
 #include <string>
diff --git a/src/core/AST.h b/src/core/AST.h
index ce6db668c56..4d2a030056f 100644
--- a/src/core/AST.h
+++ b/src/core/AST.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <string>
 #include <memory>
 #include <boost/filesystem.hpp>
diff --git a/src/core/Arguments.cc b/src/core/Arguments.cc
index 081570585fc..16cf5401e43 100644
--- a/src/core/Arguments.cc
+++ b/src/core/Arguments.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <memory>
 #include "core/Arguments.h"
 #include "core/Expression.h"
diff --git a/src/core/Assignment.cc b/src/core/Assignment.cc
index f768398cb3b..012eebe528e 100644
--- a/src/core/Assignment.cc
+++ b/src/core/Assignment.cc
@@ -27,6 +27,7 @@
 #include "core/Assignment.h"
 #include "core/customizer/Annotation.h"
 #include "core/Expression.h"
+#include <ostream>
 #include <sstream>
 #include <string>
 
diff --git a/src/core/Expression.cc b/src/core/Expression.cc
index 828bf088bff..b4275d363c0 100644
--- a/src/core/Expression.cc
+++ b/src/core/Expression.cc
@@ -26,6 +26,7 @@
 #include "utils/compiler_specific.h"
 #include "core/Expression.h"
 #include "core/Value.h"
+#include <ostream>
 #include <cstdint>
 #include <cmath>
 #include <cassert>
diff --git a/src/core/Expression.h b/src/core/Expression.h
index 100dc07d9bd..552a01e6e9a 100644
--- a/src/core/Expression.h
+++ b/src/core/Expression.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <utility>
 #include <cstddef>
 #include <functional>
diff --git a/src/core/FunctionType.cc b/src/core/FunctionType.cc
index ac0cb726536..8b381f2a704 100644
--- a/src/core/FunctionType.cc
+++ b/src/core/FunctionType.cc
@@ -1,3 +1,4 @@
+#include <ostream>
 #include "core/Value.h"
 #include "core/Expression.h"
 #include "core/FunctionType.h"
diff --git a/src/core/ImportNode.cc b/src/core/ImportNode.cc
index 9362d5b81fe..3b590e066fd 100644
--- a/src/core/ImportNode.cc
+++ b/src/core/ImportNode.cc
@@ -43,6 +43,7 @@
 #include "Feature.h"
 #include "handle_dep.h"
 #include "utils/boost-utils.h"
+#include <ios>
 #include <utility>
 #include <memory>
 #include <sys/types.h>
diff --git a/src/core/LocalScope.cc b/src/core/LocalScope.cc
index 026b90fcdcf..ea6e6ef1d03 100644
--- a/src/core/LocalScope.cc
+++ b/src/core/LocalScope.cc
@@ -1,3 +1,4 @@
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <string>
diff --git a/src/core/LocalScope.h b/src/core/LocalScope.h
index 712b37a6076..942376cc792 100644
--- a/src/core/LocalScope.h
+++ b/src/core/LocalScope.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "core/Assignment.h"
+#include <ostream>
 #include <cstddef>
 #include <unordered_map>
 #include <memory>
diff --git a/src/core/ModuleInstantiation.cc b/src/core/ModuleInstantiation.cc
index e4b1c1ee00a..161a06e5eac 100644
--- a/src/core/ModuleInstantiation.cc
+++ b/src/core/ModuleInstantiation.cc
@@ -1,3 +1,4 @@
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <string>
diff --git a/src/core/ModuleInstantiation.h b/src/core/ModuleInstantiation.h
index def47498519..509672b4047 100644
--- a/src/core/ModuleInstantiation.h
+++ b/src/core/ModuleInstantiation.h
@@ -2,6 +2,7 @@
 
 #include "core/AST.h"
 #include "core/LocalScope.h"
+#include <ostream>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/core/NodeDumper.cc b/src/core/NodeDumper.cc
index 8e178002bcf..34592db5670 100644
--- a/src/core/NodeDumper.cc
+++ b/src/core/NodeDumper.cc
@@ -1,6 +1,7 @@
 #include "core/NodeDumper.h"
 #include "core/State.h"
 #include "core/ModuleInstantiation.h"
+#include <ostream>
 #include <string>
 #include <sstream>
 #include <boost/regex.hpp>
diff --git a/src/core/NodeDumper.h b/src/core/NodeDumper.h
index 358cfa58181..3d453d1c0e6 100644
--- a/src/core/NodeDumper.h
+++ b/src/core/NodeDumper.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <sstream>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/src/core/OffsetNode.cc b/src/core/OffsetNode.cc
index 2b2dc1a8404..417253e9737 100644
--- a/src/core/OffsetNode.cc
+++ b/src/core/OffsetNode.cc
@@ -32,6 +32,7 @@
 #include "core/Parameters.h"
 #include "core/Builtins.h"
 
+#include <ios>
 #include <utility>
 #include <memory>
 #include <sstream>
diff --git a/src/core/Parameters.cc b/src/core/Parameters.cc
index 2de5a59bd9e..c1e213a2cbc 100644
--- a/src/core/Parameters.cc
+++ b/src/core/Parameters.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <sstream>
 #include <memory>
 #include <cstddef>
 #include <set>
diff --git a/src/core/RotateExtrudeNode.cc b/src/core/RotateExtrudeNode.cc
index f49b52f5d3d..87e23e90248 100644
--- a/src/core/RotateExtrudeNode.cc
+++ b/src/core/RotateExtrudeNode.cc
@@ -33,6 +33,7 @@
 #include "io/fileutils.h"
 #include "core/Builtins.h"
 #include "handle_dep.h"
+#include <ios>
 #include <utility>
 #include <memory>
 #include <cmath>
diff --git a/src/core/SourceFile.cc b/src/core/SourceFile.cc
index 2e77c811e01..cf72af19441 100644
--- a/src/core/SourceFile.cc
+++ b/src/core/SourceFile.cc
@@ -32,6 +32,7 @@
 #include "core/ScopeContext.h"
 #include "core/parsersettings.h"
 #include "core/StatCache.h"
+#include <ostream>
 #include <memory>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/core/SourceFile.h b/src/core/SourceFile.h
index 6764d55da05..cfdf331f5ad 100644
--- a/src/core/SourceFile.h
+++ b/src/core/SourceFile.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/src/core/UserModule.cc b/src/core/UserModule.cc
index 98abbc543db..e8381b5f686 100644
--- a/src/core/UserModule.cc
+++ b/src/core/UserModule.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <memory>
 #include <vector>
 
diff --git a/src/core/UserModule.h b/src/core/UserModule.h
index 0e216b9b11c..0ee1054930f 100644
--- a/src/core/UserModule.h
+++ b/src/core/UserModule.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/core/Value.cc b/src/core/Value.cc
index f85a9cec3e5..610cd219157 100644
--- a/src/core/Value.cc
+++ b/src/core/Value.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <utility>
 #include <cstdint>
 #include <cassert>
diff --git a/src/core/customizer/Annotation.cc b/src/core/customizer/Annotation.cc
index 1f0f7f92a6f..d8b95341460 100644
--- a/src/core/customizer/Annotation.cc
+++ b/src/core/customizer/Annotation.cc
@@ -27,6 +27,7 @@
 
 #include "core/customizer/Annotation.h"
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/core/customizer/Annotation.h b/src/core/customizer/Annotation.h
index 965ea49ccbe..290c5626bc5 100644
--- a/src/core/customizer/Annotation.h
+++ b/src/core/customizer/Annotation.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/core/function.cc b/src/core/function.cc
index a2ba0d5ad99..8bee09d5344 100644
--- a/src/core/function.cc
+++ b/src/core/function.cc
@@ -28,6 +28,7 @@
 #include "core/Expression.h"
 #include "core/function.h"
 
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <utility>
diff --git a/src/core/function.h b/src/core/function.h
index 0446aa07d4f..586415f0691 100644
--- a/src/core/function.h
+++ b/src/core/function.h
@@ -5,6 +5,7 @@
 #include "Feature.h"
 #include "core/Value.h"
 
+#include <ostream>
 #include <memory>
 #include <functional>
 #include <string>
diff --git a/src/core/node.h b/src/core/node.h
index c41c871ac1a..4e098b72417 100644
--- a/src/core/node.h
+++ b/src/core/node.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <utility>
diff --git a/src/geometry/Geometry.cc b/src/geometry/Geometry.cc
index af88d42968f..3281212d355 100644
--- a/src/geometry/Geometry.cc
+++ b/src/geometry/Geometry.cc
@@ -1,5 +1,6 @@
 #include "geometry/Geometry.h"
 #include "utils/printutils.h"
+#include <sstream>
 #include <memory>
 #include <boost/foreach.hpp>
 #include <cstddef>
diff --git a/src/geometry/PolySet.cc b/src/geometry/PolySet.cc
index 3bdf37dbc14..a299d6d4240 100644
--- a/src/geometry/PolySet.cc
+++ b/src/geometry/PolySet.cc
@@ -29,6 +29,7 @@
 #include "geometry/linalg.h"
 #include "utils/printutils.h"
 #include "geometry/Grid.h"
+#include <sstream>
 #include <memory>
 #include <Eigen/LU>
 #include <cstddef>
diff --git a/src/geometry/Polygon2d.cc b/src/geometry/Polygon2d.cc
index 07c7fdf0410..608cc166266 100644
--- a/src/geometry/Polygon2d.cc
+++ b/src/geometry/Polygon2d.cc
@@ -1,5 +1,6 @@
 #include "geometry/Polygon2d.h"
 
+#include <sstream>
 #include <utility>
 #include <cstddef>
 #include <string>
diff --git a/src/geometry/cgal/cgalutils-coplanar-faces-remesher.h b/src/geometry/cgal/cgalutils-coplanar-faces-remesher.h
index e6d7f971634..084c69c9663 100644
--- a/src/geometry/cgal/cgalutils-coplanar-faces-remesher.h
+++ b/src/geometry/cgal/cgalutils-coplanar-faces-remesher.h
@@ -1,6 +1,7 @@
 // Portions of this file are Copyright 2021 Google LLC, and licensed under GPL2+. See COPYING.
 #pragma once
 
+#include <iostream>
 #include <CGAL/Surface_mesh.h>
 #include <cstddef>
 #include <unordered_map>
diff --git a/src/geometry/cgal/cgalutils-polyhedron.cc b/src/geometry/cgal/cgalutils-polyhedron.cc
index ffee7d00c18..6666cd7c637 100644
--- a/src/geometry/cgal/cgalutils-polyhedron.cc
+++ b/src/geometry/cgal/cgalutils-polyhedron.cc
@@ -6,6 +6,7 @@
 #include "utils/printutils.h"
 #include "geometry/Grid.h"
 
+#include <ostream>
 #include <memory>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
diff --git a/src/geometry/manifold/ManifoldGeometry.cc b/src/geometry/manifold/ManifoldGeometry.cc
index fcd5bba84a0..6691fdf32e5 100644
--- a/src/geometry/manifold/ManifoldGeometry.cc
+++ b/src/geometry/manifold/ManifoldGeometry.cc
@@ -1,6 +1,7 @@
 // Portions of this file are Copyright 2023 Google LLC, and licensed under GPL2+. See COPYING.
 #include "geometry/manifold/ManifoldGeometry.h"
 #include "geometry/Polygon2d.h"
+#include <sstream>
 #include <utility>
 #include <cstdint>
 #include <manifold/cross_section.h>
diff --git a/src/geometry/roof_vd.cc b/src/geometry/roof_vd.cc
index aa38551f617..0bf763c7972 100644
--- a/src/geometry/roof_vd.cc
+++ b/src/geometry/roof_vd.cc
@@ -1,6 +1,7 @@
 // This file is a part of openscad. Everything implied is implied.
 // Author: Alexey Korepanov <kaikaikai@yandex.ru>
 
+#include <ostream>
 #include <cstdint>
 #include <memory>
 
diff --git a/src/glview/OffscreenContextCGL.cc b/src/glview/OffscreenContextCGL.cc
index f6c762125c0..b0485c629eb 100644
--- a/src/glview/OffscreenContextCGL.cc
+++ b/src/glview/OffscreenContextCGL.cc
@@ -1,5 +1,6 @@
 #include "glview/OffscreenContextCGL.h"
 
+#include <sstream>
 #include <memory>
 #include <cstddef>
 #include <string>
diff --git a/src/glview/OffscreenView.cc b/src/glview/OffscreenView.cc
index 4fd24486884..b39e48ed3d1 100644
--- a/src/glview/OffscreenView.cc
+++ b/src/glview/OffscreenView.cc
@@ -1,5 +1,6 @@
 #include "glview/OffscreenView.h"
 #include "glview/system-gl.h"
+#include <iostream>
 #include <cstdint>
 #include <cmath>
 #include <cstdio>
diff --git a/src/glview/Renderer.cc b/src/glview/Renderer.cc
index 946c404bb57..7144a403148 100644
--- a/src/glview/Renderer.cc
+++ b/src/glview/Renderer.cc
@@ -6,6 +6,7 @@
 #include "platform/PlatformUtils.h"
 #include "glview/system-gl.h"
 
+#include <sstream>
 #include <Eigen/LU>
 #include <fstream>
 #include <string>
diff --git a/src/glview/offscreen-old/OffscreenContextEGL.cc b/src/glview/offscreen-old/OffscreenContextEGL.cc
index b5d55e2e9d0..d7657f41791 100644
--- a/src/glview/offscreen-old/OffscreenContextEGL.cc
+++ b/src/glview/offscreen-old/OffscreenContextEGL.cc
@@ -25,6 +25,7 @@
  */
 #include "glview/offscreen-old/OffscreenContextEGL.h"
 
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <EGL/egl.h>
diff --git a/src/glview/offscreen-old/OffscreenContextGLX.cc b/src/glview/offscreen-old/OffscreenContextGLX.cc
index 196e8a737b3..2f2cc06713d 100644
--- a/src/glview/offscreen-old/OffscreenContextGLX.cc
+++ b/src/glview/offscreen-old/OffscreenContextGLX.cc
@@ -38,6 +38,7 @@
 
 
 #include "glview/system-gl.h"
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <GL/gl.h>
diff --git a/src/glview/offscreen-old/OffscreenContextWGL.cc b/src/glview/offscreen-old/OffscreenContextWGL.cc
index ac1caedd8b0..314b22b2707 100644
--- a/src/glview/offscreen-old/OffscreenContextWGL.cc
+++ b/src/glview/offscreen-old/OffscreenContextWGL.cc
@@ -13,6 +13,7 @@
 #include "glview/offscreen-old/OffscreenContextWGL.h"
 
 #undef NOGDI
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <windows.h>
diff --git a/src/gui/Animate.cc b/src/gui/Animate.cc
index 8622d54b128..08498a8f818 100644
--- a/src/gui/Animate.cc
+++ b/src/gui/Animate.cc
@@ -1,6 +1,7 @@
 #include "gui/Animate.h"
 #include "utils/printutils.h"
 #include "gui/MainWindow.h"
+#include <iostream>
 #include <boost/filesystem.hpp>
 #include <QFormLayout>
 
diff --git a/src/gui/MainWindow.cc b/src/gui/MainWindow.cc
index dbea4ad02ed..8da867f8cc2 100644
--- a/src/gui/MainWindow.cc
+++ b/src/gui/MainWindow.cc
@@ -23,6 +23,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#include <sstream>
 #include <iostream>
 #include <memory>
 #include <string>
diff --git a/src/gui/Measurement.cc b/src/gui/Measurement.cc
index 8daf3693c1d..2085a8ee3d7 100644
--- a/src/gui/Measurement.cc
+++ b/src/gui/Measurement.cc
@@ -26,6 +26,7 @@
 
 #include "gui/Measurement.h"
 
+#include <sstream>
 #include <string>
 
 Measurement::Measurement()
diff --git a/src/gui/QGLView.cc b/src/gui/QGLView.cc
index 7d8dd8f1ab9..55e6b8a1dea 100644
--- a/src/gui/QGLView.cc
+++ b/src/gui/QGLView.cc
@@ -33,6 +33,7 @@
 #include "glview/glew-utils.h"
 #endif
 
+#include <iostream>
 #include <QApplication>
 #include <QWheelEvent>
 #include <QCheckBox>
diff --git a/src/gui/ViewportControl.cc b/src/gui/ViewportControl.cc
index 55166d226cb..45cc62b7c85 100644
--- a/src/gui/ViewportControl.cc
+++ b/src/gui/ViewportControl.cc
@@ -2,6 +2,7 @@
 #include "utils/printutils.h"
 #include "gui/MainWindow.h"
 #include "gui/QGLView.h"
+#include <iostream>
 #include <boost/filesystem.hpp>
 #include <cfloat>
 #include <QDoubleSpinBox>
diff --git a/src/gui/input/HidApiInputDriver.cc b/src/gui/input/HidApiInputDriver.cc
index 5cb376ffb6b..530c1b11e6a 100644
--- a/src/gui/input/HidApiInputDriver.cc
+++ b/src/gui/input/HidApiInputDriver.cc
@@ -29,6 +29,8 @@
  *  Public Domain.
  */
 
+#include <ios>
+#include <sstream>
 #include <cstdint>
 #include <bitset>
 #include <boost/format.hpp>
diff --git a/src/gui/input/InputDriverManager.cc b/src/gui/input/InputDriverManager.cc
index 8b2cc65685a..fbc1f42533f 100644
--- a/src/gui/input/InputDriverManager.cc
+++ b/src/gui/input/InputDriverManager.cc
@@ -26,6 +26,7 @@
 #include "gui/input/InputDriverEvent.h"
 #include "gui/input/InputDriverManager.h"
 #include "gui/MainWindow.h"
+#include <sstream>
 #include <QAction>
 #include <QMenu>
 #include <QApplication>
diff --git a/src/handle_dep.cc b/src/handle_dep.cc
index e6ad914c17d..a02094f2e67 100644
--- a/src/handle_dep.cc
+++ b/src/handle_dep.cc
@@ -1,5 +1,6 @@
 #include "handle_dep.h"
 #include "utils/printutils.h"
+#include <iostream>
 #include <string>
 #include <sstream>
 #include <cstdlib> // for system()
diff --git a/src/io/export.cc b/src/io/export.cc
index 98376a08e64..7d56edd2cb3 100644
--- a/src/io/export.cc
+++ b/src/io/export.cc
@@ -29,6 +29,7 @@
 #include "utils/printutils.h"
 #include "geometry/Geometry.h"
 
+#include <iostream>
 #include <cstdint>
 #include <memory>
 #include <cstddef>
diff --git a/src/io/export_3mf_v1.cc b/src/io/export_3mf_v1.cc
index d4853cff7e5..9bf6a96dce3 100644
--- a/src/io/export_3mf_v1.cc
+++ b/src/io/export_3mf_v1.cc
@@ -36,6 +36,7 @@
 #include "geometry/manifold/ManifoldGeometry.h"
 #endif
 
+#include <ostream>
 #include <cstdint>
 #include <memory>
 #include <string>
diff --git a/src/io/export_3mf_v2.cc b/src/io/export_3mf_v2.cc
index af068d64da9..0b84dddd494 100644
--- a/src/io/export_3mf_v2.cc
+++ b/src/io/export_3mf_v2.cc
@@ -36,6 +36,7 @@
 #include "geometry/manifold/ManifoldGeometry.h"
 #endif
 
+#include <ostream>
 #include <utility>
 #include <cstdint>
 #include <memory>
diff --git a/src/io/export_amf.cc b/src/io/export_amf.cc
index 3fe59dde6dc..619f9a97eae 100644
--- a/src/io/export_amf.cc
+++ b/src/io/export_amf.cc
@@ -34,6 +34,7 @@
 #include "geometry/cgal/CGAL_Nef_polyhedron.h"
 #endif
 
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <string>
diff --git a/src/io/export_dxf.cc b/src/io/export_dxf.cc
index a41927bb2fc..50216ecc110 100644
--- a/src/io/export_dxf.cc
+++ b/src/io/export_dxf.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <memory>
 #include "io/export.h"
 #include "geometry/PolySet.h"
diff --git a/src/io/export_nef.cc b/src/io/export_nef.cc
index 00bd9130fa8..e709ea62d07 100644
--- a/src/io/export_nef.cc
+++ b/src/io/export_nef.cc
@@ -32,6 +32,7 @@
 #include "geometry/cgal/CGAL_Nef_polyhedron.h"
 #include "geometry/cgal/cgal.h"
 #include "geometry/cgal/cgalutils.h"
+#include <ostream>
 #include <memory>
 #include <CGAL/IO/Nef_polyhedron_iostream_3.h> // for dumping .nef3
 
diff --git a/src/io/export_obj.cc b/src/io/export_obj.cc
index 4e7ce2d5747..ec60fc03169 100644
--- a/src/io/export_obj.cc
+++ b/src/io/export_obj.cc
@@ -25,6 +25,7 @@
  *
  */
 
+#include <ostream>
 #include <memory>
 #include "io/export.h"
 
diff --git a/src/io/export_off.cc b/src/io/export_off.cc
index 94fb9eeb912..391bfad4bd1 100644
--- a/src/io/export_off.cc
+++ b/src/io/export_off.cc
@@ -32,6 +32,7 @@
 #include "geometry/PolySet.h"
 #include "geometry/PolySetUtils.h"
 
+#include <ostream>
 #include <memory>
 #include <cstddef>
 #include <cstdint>
diff --git a/src/io/export_pdf.cc b/src/io/export_pdf.cc
index 353f9b19fd0..59fc0649b21 100644
--- a/src/io/export_pdf.cc
+++ b/src/io/export_pdf.cc
@@ -5,6 +5,7 @@
 // #include "version.h"
 #include "utils/version_helper.h"
 
+#include <ostream>
 #include <memory>
 #include <string>
 #include <cmath>
diff --git a/src/io/export_png.cc b/src/io/export_png.cc
index 96d84770aba..24224dba5ec 100644
--- a/src/io/export_png.cc
+++ b/src/io/export_png.cc
@@ -2,6 +2,7 @@
 #include "utils/printutils.h"
 #include "glview/OffscreenView.h"
 #include "glview/CsgInfo.h"
+#include <ostream>
 #include <cstdio>
 #include <memory>
 #include "glview/RenderSettings.h"
diff --git a/src/io/export_stl.cc b/src/io/export_stl.cc
index 9d71f09037e..e4a8370209a 100644
--- a/src/io/export_stl.cc
+++ b/src/io/export_stl.cc
@@ -27,6 +27,8 @@
 #include "io/export.h"
 #include "geometry/PolySet.h"
 #include "geometry/PolySetUtils.h"
+#include <ios>
+#include <ostream>
 #include <cstdint>
 #include <memory>
 #include <double-conversion/double-conversion.h>
diff --git a/src/io/export_svg.cc b/src/io/export_svg.cc
index 42c8fd80303..02a21381034 100644
--- a/src/io/export_svg.cc
+++ b/src/io/export_svg.cc
@@ -24,6 +24,7 @@
  *
  */
 
+#include <ostream>
 #include <memory>
 #include "io/export.h"
 #include "geometry/PolySet.h"
diff --git a/src/io/export_wrl.cc b/src/io/export_wrl.cc
index a6f41c989cc..71bf6551431 100644
--- a/src/io/export_wrl.cc
+++ b/src/io/export_wrl.cc
@@ -28,6 +28,7 @@
 #include "geometry/PolySet.h"
 #include "geometry/PolySetUtils.h"
 
+#include <ostream>
 #include <memory>
 #include <cstddef>
 
diff --git a/src/io/imageutils-lodepng.cc b/src/io/imageutils-lodepng.cc
index f8769c544ec..66ad2e02485 100644
--- a/src/io/imageutils-lodepng.cc
+++ b/src/io/imageutils-lodepng.cc
@@ -1,5 +1,6 @@
 #include "io/imageutils.h"
 #include "lodepng/lodepng.h"
+#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <vector>
diff --git a/src/io/imageutils.cc b/src/io/imageutils.cc
index 8f084e1c3d6..a12d06d86e2 100644
--- a/src/io/imageutils.cc
+++ b/src/io/imageutils.cc
@@ -1,4 +1,5 @@
 #include "io/imageutils.h"
+#include <iostream>
 #include <cassert>
 #include <cstring>
 #include <fstream>
diff --git a/src/io/import_nef.cc b/src/io/import_nef.cc
index b55c68f460b..e266e8ecfaf 100644
--- a/src/io/import_nef.cc
+++ b/src/io/import_nef.cc
@@ -1,5 +1,6 @@
 #include "io/import.h"
 
+#include <ios>
 #include <memory>
 #include <string>
 #include "utils/printutils.h"
diff --git a/src/io/import_obj.cc b/src/io/import_obj.cc
index 7fe726bf7f3..e5e2fcdd442 100644
--- a/src/io/import_obj.cc
+++ b/src/io/import_obj.cc
@@ -1,6 +1,7 @@
 #include "io/import.h"
 #include "geometry/PolySet.h"
 #include "geometry/PolySetBuilder.h"
+#include <ios>
 #include <memory>
 #include <fstream>
 #include <string>
diff --git a/src/io/import_off.cc b/src/io/import_off.cc
index 69051fed5eb..3bbc69a57ba 100644
--- a/src/io/import_off.cc
+++ b/src/io/import_off.cc
@@ -3,6 +3,7 @@
 #include "geometry/PolySet.h"
 #include "utils/printutils.h"
 #include "core/AST.h"
+#include <ios>
 #include <cstdint>
 #include <memory>
 #include <charconv>
diff --git a/src/io/import_stl.cc b/src/io/import_stl.cc
index ab99230474f..c8abbed8567 100644
--- a/src/io/import_stl.cc
+++ b/src/io/import_stl.cc
@@ -4,6 +4,7 @@
 #include "utils/printutils.h"
 #include "core/AST.h"
 
+#include <ios>
 #include <cstdint>
 #include <memory>
 #include <cstddef>
diff --git a/src/io/libsvg/circle.cc b/src/io/libsvg/circle.cc
index db99e79df60..7627c77d91a 100644
--- a/src/io/libsvg/circle.cc
+++ b/src/io/libsvg/circle.cc
@@ -25,6 +25,7 @@
 #include "libsvg/circle.h"
 #include "libsvg/util.h"
 
+#include <sstream>
 #include <string>
 
 namespace libsvg {
diff --git a/src/io/libsvg/data.cc b/src/io/libsvg/data.cc
index 67f518e6db0..98531218b69 100644
--- a/src/io/libsvg/data.cc
+++ b/src/io/libsvg/data.cc
@@ -24,6 +24,7 @@
  */
 #include "libsvg/data.h"
 
+#include <sstream>
 #include <string>
 
 namespace libsvg {
diff --git a/src/io/libsvg/ellipse.cc b/src/io/libsvg/ellipse.cc
index 327854113f1..afb87e0ebb2 100644
--- a/src/io/libsvg/ellipse.cc
+++ b/src/io/libsvg/ellipse.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <cstdlib>
 #include <string>
 #include <iostream>
diff --git a/src/io/libsvg/group.cc b/src/io/libsvg/group.cc
index 7630c2186ca..e2ee175c854 100644
--- a/src/io/libsvg/group.cc
+++ b/src/io/libsvg/group.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <cstdlib>
 #include <string>
 #include <iostream>
diff --git a/src/io/libsvg/libsvg.cc b/src/io/libsvg/libsvg.cc
index 2c688757e86..f4abf791f55 100644
--- a/src/io/libsvg/libsvg.cc
+++ b/src/io/libsvg/libsvg.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <iostream>
 #include <memory>
 #include <map>
 #include <stack>
diff --git a/src/io/libsvg/line.cc b/src/io/libsvg/line.cc
index eaa6d64d2ea..6352f8028bd 100644
--- a/src/io/libsvg/line.cc
+++ b/src/io/libsvg/line.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <string>
 #include "libsvg/line.h"
 #include "libsvg/util.h"
diff --git a/src/io/libsvg/path.cc b/src/io/libsvg/path.cc
index 5a0dabb716f..853f2730417 100644
--- a/src/io/libsvg/path.cc
+++ b/src/io/libsvg/path.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <cstdlib>
 #include <vector>
 #include <string>
diff --git a/src/io/libsvg/rect.cc b/src/io/libsvg/rect.cc
index d18397c3c89..c3b1477d595 100644
--- a/src/io/libsvg/rect.cc
+++ b/src/io/libsvg/rect.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <cstdlib>
 #include <iostream>
 #include <cmath>
diff --git a/src/io/libsvg/shape.cc b/src/io/libsvg/shape.cc
index e401ac77fcc..2b5ffa873b0 100644
--- a/src/io/libsvg/shape.cc
+++ b/src/io/libsvg/shape.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <iostream>
 #include <memory>
 #include <cstdio>
 #include <cmath>
diff --git a/src/io/libsvg/svgpage.cc b/src/io/libsvg/svgpage.cc
index d7291c01e33..4ba865a1759 100644
--- a/src/io/libsvg/svgpage.cc
+++ b/src/io/libsvg/svgpage.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <cstdlib>
 #include <string>
 #include <iostream>
diff --git a/src/io/libsvg/text.cc b/src/io/libsvg/text.cc
index d33baed4cc6..045553a715e 100644
--- a/src/io/libsvg/text.cc
+++ b/src/io/libsvg/text.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <string>
 #include "libsvg/text.h"
 #include "libsvg/util.h"
diff --git a/src/io/libsvg/transformation.cc b/src/io/libsvg/transformation.cc
index 1e28b36ccd7..2ccda003415 100644
--- a/src/io/libsvg/transformation.cc
+++ b/src/io/libsvg/transformation.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <string>
 #include <vector>
 #include <iostream>
diff --git a/src/io/libsvg/tspan.cc b/src/io/libsvg/tspan.cc
index 73f4d35f674..63f4d6a0a49 100644
--- a/src/io/libsvg/tspan.cc
+++ b/src/io/libsvg/tspan.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <string>
 
 #include "libsvg/tspan.h"
diff --git a/src/io/libsvg/use.cc b/src/io/libsvg/use.cc
index ea06c67dbe4..8a0c51e38c0 100644
--- a/src/io/libsvg/use.cc
+++ b/src/io/libsvg/use.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <sstream>
 #include <memory>
 #include <cstdlib>
 #include <iostream>
diff --git a/src/io/libsvg/util.cc b/src/io/libsvg/util.cc
index 0427d703333..1bbdd411c72 100644
--- a/src/io/libsvg/util.cc
+++ b/src/io/libsvg/util.cc
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <ostream>
 #include <boost/spirit/include/qi.hpp>
 
 #include <string>
diff --git a/src/io/libsvg/util.h b/src/io/libsvg/util.h
index d69da428185..c8973fd2f24 100644
--- a/src/io/libsvg/util.h
+++ b/src/io/libsvg/util.h
@@ -24,6 +24,7 @@
  */
 #pragma once
 
+#include <ostream>
 #include <string>
 
 namespace libsvg {
diff --git a/src/openscad.cc b/src/openscad.cc
index 5755b7ee41a..9dc12e7c380 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -48,6 +48,8 @@
 #include "core/customizer/ParameterObject.h"
 #include "core/customizer/ParameterSet.h"
 #include "openscad_mimalloc.h"
+#include <sstream>
+#include <iostream>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/platform/PlatformUtils-posix.cc b/src/platform/PlatformUtils-posix.cc
index 5bd7fd5bfcf..b63e9aad92f 100644
--- a/src/platform/PlatformUtils-posix.cc
+++ b/src/platform/PlatformUtils-posix.cc
@@ -1,3 +1,4 @@
+#include <ios>
 #include <mutex>
 #include <string>
 #include <fstream>
diff --git a/src/platform/PlatformUtils-win.cc b/src/platform/PlatformUtils-win.cc
index e146e0290e2..beec87f7171 100644
--- a/src/platform/PlatformUtils-win.cc
+++ b/src/platform/PlatformUtils-win.cc
@@ -1,5 +1,6 @@
 #include "platform/PlatformUtils.h"
 
+#include <ios>
 #include <map>
 #include <string>
 
diff --git a/src/utils/printutils.cc b/src/utils/printutils.cc
index 7a6b249fa77..058ce8d9628 100644
--- a/src/utils/printutils.cc
+++ b/src/utils/printutils.cc
@@ -1,4 +1,5 @@
 #include "utils/printutils.h"
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <cstdio>
diff --git a/src/utils/svg.cc b/src/utils/svg.cc
index ec9c83d5ebe..ef6bd42e479 100644
--- a/src/utils/svg.cc
+++ b/src/utils/svg.cc
@@ -1,6 +1,7 @@
 #ifdef ENABLE_CGAL
 #include "utils/svg.h"
 #include "geometry/cgal/cgalutils.h"
+#include <sstream>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <map>