diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
index 806f1a86..f8dfa503 100644
--- a/src/ChunkReader.cpp
+++ b/src/ChunkReader.cpp
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
+#include <fstream>
+
 #include "ChunkReader.h"
 #include "Exceptions.h"
 #include "FFmpegReader.h"
diff --git a/src/Clip.cpp b/src/Clip.cpp
index c28a7a55..81d2e524 100644
--- a/src/Clip.cpp
+++ b/src/Clip.cpp
@@ -14,14 +14,17 @@
 #include "Exceptions.h"
 #include "FFmpegReader.h"
 #include "FrameMapper.h"
-#ifdef USE_IMAGEMAGICK
-	#include "ImageReader.h"
-	#include "TextReader.h"
-#endif
 #include "QtImageReader.h"
 #include "ChunkReader.h"
 #include "DummyReader.h"
 #include "Timeline.h"
+#include "ZmqLogger.h"
+
+#ifdef USE_IMAGEMAGICK
+    #include "MagickUtilities.h"
+    #include "ImageReader.h"
+    #include "TextReader.h"
+#endif
 
 #include <Qt>
 
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index 6cf0203a..f1ef5922 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -18,6 +18,7 @@
 #include "FFmpegReader.h"
 #include "Exceptions.h"
 #include "Timeline.h"
+#include "ZmqLogger.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds
diff --git a/src/Frame.cpp b/src/Frame.cpp
index c8a041bc..155ba2b4 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -10,6 +10,11 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
+#include <thread>    // for std::this_thread::sleep_for
+#include <chrono>    // for std::chrono::milliseconds
+#include <sstream>
+#include <iomanip>
+
 #include "Frame.h"
 #include <OpenShotAudio.h>
 
@@ -27,8 +32,9 @@
 #include <QPointF>
 #include <QWidget>
 
-#include <thread>    // for std::this_thread::sleep_for
-#include <chrono>    // for std::chrono::milliseconds
+#ifdef USE_IMAGEMAGICK
+    #include "MagickUtilities.h"
+#endif
 
 using namespace std;
 using namespace openshot;
diff --git a/src/Frame.h b/src/Frame.h
index 5205aa7c..fdf78239 100644
--- a/src/Frame.h
+++ b/src/Frame.h
@@ -21,24 +21,28 @@
 	#undef int64
 #endif
 
-
-#include <iomanip>
-#include <sstream>
 #include <queue>
-#include <QApplication>
-#include <QImage>
 #include <memory>
-#include <unistd.h>
-#include "ZmqLogger.h"
+
 #include "ChannelLayouts.h"
 #include "AudioBufferSource.h"
 #include "AudioResampler.h"
 #include "Fraction.h"
+
 #include <OpenShotAudio.h>
+
+#include <QColor>
+#include <QImage>
+
 #ifdef USE_IMAGEMAGICK
-	#include "MagickUtilities.h"
+// Forward declare Magick::Image
+namespace Magick {
+    class Image;
+}
 #endif
 
+class QApplication;
+
 namespace openshot
 {
 	/**
diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
index 981bc548..59e03782 100644
--- a/src/FrameMapper.cpp
+++ b/src/FrameMapper.cpp
@@ -17,6 +17,7 @@
 #include "FrameMapper.h"
 #include "Exceptions.h"
 #include "Clip.h"
+#include "ZmqLogger.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/Qt/PlayerPrivate.cpp b/src/Qt/PlayerPrivate.cpp
index 40de28fd..0594513b 100644
--- a/src/Qt/PlayerPrivate.cpp
+++ b/src/Qt/PlayerPrivate.cpp
@@ -13,6 +13,7 @@
 
 #include "PlayerPrivate.h"
 #include "Exceptions.h"
+#include "ZmqLogger.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono milliseconds, high_resolution_clock
diff --git a/src/Qt/VideoCacheThread.cpp b/src/Qt/VideoCacheThread.cpp
index 7d37fa59..e642cddc 100644
--- a/src/Qt/VideoCacheThread.cpp
+++ b/src/Qt/VideoCacheThread.cpp
@@ -12,8 +12,9 @@
 
 #include "VideoCacheThread.h"
 #include "Exceptions.h"
-#include <algorithm>
+#include "ZmqLogger.h"
 
+#include <algorithm>
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds
 
diff --git a/src/Qt/VideoPlaybackThread.cpp b/src/Qt/VideoPlaybackThread.cpp
index 16019911..87c9cdd9 100644
--- a/src/Qt/VideoPlaybackThread.cpp
+++ b/src/Qt/VideoPlaybackThread.cpp
@@ -12,6 +12,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "VideoPlaybackThread.h"
+#include "ZmqLogger.h"
 
 namespace openshot
 {
diff --git a/src/TrackedObjectBBox.cpp b/src/TrackedObjectBBox.cpp
index 87751607..bd042c10 100644
--- a/src/TrackedObjectBBox.cpp
+++ b/src/TrackedObjectBBox.cpp
@@ -11,6 +11,8 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
+#include <fstream>
+
 #include "TrackedObjectBBox.h"
 
 #include "Clip.h"