diff --git a/examples/Example_opencv.cpp b/examples/Example_opencv.cpp
index f25c01e0..5b9adb1e 100644
--- a/examples/Example_opencv.cpp
+++ b/examples/Example_opencv.cpp
@@ -13,6 +13,7 @@
 #include <fstream>
 #include <iostream>
 #include <memory>
+#include <sstream>
 #include "CVTracker.h"
 #include "CVStabilization.h"
 #include "CVObjectDetection.h"
diff --git a/external/godot-cpp b/external/godot-cpp
index cc8ad37e..b0e3b1e4 160000
--- a/external/godot-cpp
+++ b/external/godot-cpp
@@ -1 +1 @@
-Subproject commit cc8ad37ee0d70c70d2334f44f2eec979582061c7
+Subproject commit b0e3b1e4b78a606f48d162898afb5eeda533d2a9
diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
index 960744fa..22842db3 100644
--- a/src/CacheDisk.cpp
+++ b/src/CacheDisk.cpp
@@ -15,6 +15,7 @@
 #include "Frame.h"
 #include "QtUtilities.h"
 
+#include <sstream>
 #include <Qt>
 #include <QString>
 #include <QTextStream>
diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
index f8dfa503..66fdf294 100644
--- a/src/ChunkReader.cpp
+++ b/src/ChunkReader.cpp
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include <fstream>
+#include <sstream>
 
 #include "ChunkReader.h"
 #include "Exceptions.h"
diff --git a/src/ChunkWriter.cpp b/src/ChunkWriter.cpp
index 62d54e08..24ff4581 100644
--- a/src/ChunkWriter.cpp
+++ b/src/ChunkWriter.cpp
@@ -14,6 +14,8 @@
 #include "Exceptions.h"
 #include "Frame.h"
 
+#include <sstream>
+
 using namespace openshot;
 
 ChunkWriter::ChunkWriter(std::string path, ReaderBase *reader) :
diff --git a/src/Clip.cpp b/src/Clip.cpp
index b385ec53..022c0065 100644
--- a/src/Clip.cpp
+++ b/src/Clip.cpp
@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <sstream>
 
 #ifdef USE_IMAGEMAGICK
 	#include "MagickUtilities.h"
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index 8e38d48d..82c595f3 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -17,6 +17,7 @@
 #include <chrono>	// for std::chrono::milliseconds
 #include <algorithm>
 #include <cmath>
+#include <sstream>
 #include <unistd.h>
 
 #include "FFmpegUtilities.h"
diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
index b1feafe3..26379041 100644
--- a/src/FFmpegWriter.cpp
+++ b/src/FFmpegWriter.cpp
@@ -17,6 +17,7 @@
 #include <iostream>
 #include <cmath>
 #include <ctime>
+#include <sstream>
 #include <unistd.h>
 
 #include "FFmpegUtilities.h"
diff --git a/src/WriterBase.cpp b/src/WriterBase.cpp
index 7a47a2c4..79542143 100644
--- a/src/WriterBase.cpp
+++ b/src/WriterBase.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <iomanip>
 #include <memory>
+#include <sstream>
 
 #include "WriterBase.h"
 #include "Exceptions.h"
diff --git a/tests/AudioWaveformer.cpp b/tests/AudioWaveformer.cpp
index 7327c383..1be2d5d3 100644
--- a/tests/AudioWaveformer.cpp
+++ b/tests/AudioWaveformer.cpp
@@ -22,6 +22,7 @@
 #include <cmath>
 #include <future>
 #include <thread>
+#include <sstream>
 
 
 using namespace openshot;
diff --git a/tests/Caption.cpp b/tests/Caption.cpp
index d90b43c5..bc5768f0 100644
--- a/tests/Caption.cpp
+++ b/tests/Caption.cpp
@@ -12,6 +12,7 @@
 
 
 #include <vector>
+#include <sstream>
 #include "openshot_catch.h"
 #include <QApplication>
 #include <QFontDatabase>
diff --git a/tests/DummyReader.cpp b/tests/DummyReader.cpp
index 7d459392..398b80ea 100644
--- a/tests/DummyReader.cpp
+++ b/tests/DummyReader.cpp
@@ -19,6 +19,7 @@
 #include "CacheMemory.h"
 #include "Fraction.h"
 #include "Frame.h"
+#include <sstream>
 
 TEST_CASE( "Default constructor", "[libopenshot][dummyreader]" ) {
 	openshot::DummyReader r;
diff --git a/tests/FrameMapper.cpp b/tests/FrameMapper.cpp
index 4396f9b2..9f92149d 100644
--- a/tests/FrameMapper.cpp
+++ b/tests/FrameMapper.cpp
@@ -21,6 +21,7 @@
 #include "Frame.h"
 #include "FrameMapper.h"
 #include "Timeline.h"
+#include <sstream>
 
 using namespace openshot;
 
diff --git a/tests/ImageReader.cpp b/tests/ImageReader.cpp
index 9183e7cf..9232fb08 100644
--- a/tests/ImageReader.cpp
+++ b/tests/ImageReader.cpp
@@ -15,6 +15,7 @@
 #include "ImageReader.h"
 #include "Exceptions.h"
 #include "Frame.h"
+#include <sstream>
 
 using namespace openshot;
 
diff --git a/tests/QtImageReader.cpp b/tests/QtImageReader.cpp
index 353049f5..e48839c3 100644
--- a/tests/QtImageReader.cpp
+++ b/tests/QtImageReader.cpp
@@ -13,6 +13,7 @@
 #include "openshot_catch.h"
 
 #include <QGuiApplication>
+#include <sstream>
 
 #include "QtImageReader.h"
 #include "Clip.h"