diff --git a/src/AudioReaderSource.cpp b/src/AudioReaderSource.cpp
index acd69deb..dba9f704 100644
--- a/src/AudioReaderSource.cpp
+++ b/src/AudioReaderSource.cpp
@@ -30,6 +30,10 @@
 
 #include "AudioReaderSource.h"
 #include "Exceptions.h"
+#include "Frame.h"
+#include "ZmqLogger.h"
+
+#include <OpenShotAudio.h>
 
 using namespace std;
 using namespace openshot;
diff --git a/src/AudioReaderSource.h b/src/AudioReaderSource.h
index 2b0cc0ea..35d570f2 100644
--- a/src/AudioReaderSource.h
+++ b/src/AudioReaderSource.h
@@ -31,8 +31,8 @@
 #ifndef OPENSHOT_AUDIOREADERSOURCE_H
 #define OPENSHOT_AUDIOREADERSOURCE_H
 
-#include <iomanip>
 #include "ReaderBase.h"
+
 #include <OpenShotAudio.h>
 
 /// This namespace is the default namespace for all code in the openshot library
diff --git a/src/CacheBase.h b/src/CacheBase.h
index b0a64f45..769a3405 100644
--- a/src/CacheBase.h
+++ b/src/CacheBase.h
@@ -32,11 +32,13 @@
 #define OPENSHOT_CACHE_BASE_H
 
 #include <memory>
-#include <cstdlib>
-#include "Frame.h"
+
 #include "Json.h"
 
+#include <OpenShotAudio.h>
+
 namespace openshot {
+	class Frame;
 
 	/**
 	 * @brief All cache managers in libopenshot are based on this CacheBase class
diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
index 6d1241ed..ec3e481b 100644
--- a/src/CacheDisk.cpp
+++ b/src/CacheDisk.cpp
@@ -30,7 +30,9 @@
 
 #include "CacheDisk.h"
 #include "Exceptions.h"
+#include "Frame.h"
 #include "QtUtilities.h"
+
 #include <Qt>
 #include <QString>
 #include <QTextStream>
diff --git a/src/CacheDisk.h b/src/CacheDisk.h
index 764497b7..a071e21b 100644
--- a/src/CacheDisk.h
+++ b/src/CacheDisk.h
@@ -34,11 +34,13 @@
 #include <map>
 #include <deque>
 #include <memory>
+
 #include "CacheBase.h"
-#include "Frame.h"
+
 #include <QDir>
 
 namespace openshot {
+	class Frame;
 
 	/**
 	 * @brief This class is a disk-based cache manager for Frame objects.
diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp
index 62dc9957..04194d76 100644
--- a/src/CacheMemory.cpp
+++ b/src/CacheMemory.cpp
@@ -30,6 +30,7 @@
 
 #include "CacheMemory.h"
 #include "Exceptions.h"
+#include "Frame.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/CacheMemory.h b/src/CacheMemory.h
index c693cb66..27bb0b9a 100644
--- a/src/CacheMemory.h
+++ b/src/CacheMemory.h
@@ -34,10 +34,11 @@
 #include <map>
 #include <deque>
 #include <memory>
+
 #include "CacheBase.h"
-#include "Frame.h"
 
 namespace openshot {
+	class Frame;
 
 	/**
 	 * @brief This class is a memory-based cache manager for Frame objects.
diff --git a/src/ChunkReader.h b/src/ChunkReader.h
index 775e20d2..004cfa39 100644
--- a/src/ChunkReader.h
+++ b/src/ChunkReader.h
@@ -31,16 +31,16 @@
 #ifndef OPENSHOT_CHUNK_READER_H
 #define OPENSHOT_CHUNK_READER_H
 
-#include "ReaderBase.h"
 #include <string>
 #include <memory>
 
-#include "Frame.h"
+#include "ReaderBase.h"
 #include "Json.h"
 #include "CacheMemory.h"
 
 namespace openshot
 {
+	class Frame;
 
 	/**
 	 * @brief This struct holds the location of a frame within a chunk.
@@ -137,7 +137,7 @@ namespace openshot
 		void SetChunkSize(int64_t new_size) { chunk_size = new_size; };
 
 		/// Get the cache object used by this reader (always return NULL for this reader)
-		openshot::CacheMemory* GetCache() override { return NULL; };
+		openshot::CacheMemory* GetCache() override { return nullptr; };
 
 		/// @brief Get an openshot::Frame object for a specific frame number of this reader.
 		/// @returns				The requested frame (containing the image and audio)
diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp
index e6c5fce1..40966929 100644
--- a/src/DummyReader.cpp
+++ b/src/DummyReader.cpp
@@ -30,6 +30,7 @@
 
 #include "DummyReader.h"
 #include "Exceptions.h"
+#include "Frame.h"
 
 using namespace openshot;
 
diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp
index a4c21b80..9a6d3be2 100644
--- a/src/ImageReader.cpp
+++ b/src/ImageReader.cpp
@@ -33,6 +33,7 @@
 
 #include "ImageReader.h"
 #include "Exceptions.h"
+#include "Frame.h"
 
 using namespace openshot;
 
diff --git a/src/Qt/VideoCacheThread.h b/src/Qt/VideoCacheThread.h
index 1ab3b193..3e73495a 100644
--- a/src/Qt/VideoCacheThread.h
+++ b/src/Qt/VideoCacheThread.h
@@ -34,6 +34,7 @@
 #include "../OpenMPUtilities.h"
 #include "../ReaderBase.h"
 #include "../RendererBase.h"
+#include "../CacheBase.h"
 
 namespace openshot
 {
diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp
index f14bcfa0..340d4b39 100644
--- a/src/QtHtmlReader.cpp
+++ b/src/QtHtmlReader.cpp
@@ -32,6 +32,8 @@
 
 #include "QtHtmlReader.h"
 #include "Exceptions.h"
+#include "Frame.h"
+
 #include <QImage>
 #include <QPainter>
 #include <QTextDocument>
diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp
index 1800a0f2..8e640475 100644
--- a/src/QtImageReader.cpp
+++ b/src/QtImageReader.cpp
@@ -34,11 +34,12 @@
 #include "Clip.h"
 #include "CacheMemory.h"
 #include "Timeline.h"
-#include <QtCore/QString>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
-#include <QtGui/QIcon>
-#include <QtGui/QImageReader>
+
+#include <QString>
+#include <QImage>
+#include <QPainter>
+#include <QIcon>
+#include <QImageReader>
 
 #if USE_RESVG == 1
 	// If defined and found in CMake, utilize the libresvg for parsing
diff --git a/src/QtImageReader.h b/src/QtImageReader.h
index 687e85e1..452cad51 100644
--- a/src/QtImageReader.h
+++ b/src/QtImageReader.h
@@ -31,15 +31,14 @@
 #ifndef OPENSHOT_QIMAGE_READER_H
 #define OPENSHOT_QIMAGE_READER_H
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
 #include <memory>
 
 #include "ReaderBase.h"
 
+#include <QImage>
+#include <QSize>
+#include <QString>
+
 namespace openshot
 {
 	// Forward decl
diff --git a/src/QtTextReader.cpp b/src/QtTextReader.cpp
index 00627e1c..804e3410 100644
--- a/src/QtTextReader.cpp
+++ b/src/QtTextReader.cpp
@@ -32,6 +32,8 @@
 
 #include "QtTextReader.h"
 #include "Exceptions.h"
+#include "Frame.h"
+
 #include <QImage>
 #include <QPainter>
 
diff --git a/src/QtTextReader.h b/src/QtTextReader.h
index db4c73fb..ca360ef6 100644
--- a/src/QtTextReader.h
+++ b/src/QtTextReader.h
@@ -35,15 +35,12 @@
 
 #include "ReaderBase.h"
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
 #include <memory>
+
 #include "CacheMemory.h"
 #include "Enums.h"
 
+#include <QFont>
 
 class QImage;
 
diff --git a/src/ReaderBase.cpp b/src/ReaderBase.cpp
index 127fefbe..4926349f 100644
--- a/src/ReaderBase.cpp
+++ b/src/ReaderBase.cpp
@@ -29,6 +29,8 @@
  */
 
 #include "ReaderBase.h"
+#include "ClipBase.h"
+#include "Frame.h"
 
 using namespace openshot;
 
diff --git a/src/ReaderBase.h b/src/ReaderBase.h
index 7b7847a8..4bb5e71c 100644
--- a/src/ReaderBase.h
+++ b/src/ReaderBase.h
@@ -31,26 +31,23 @@
 #ifndef OPENSHOT_READER_BASE_H
 #define OPENSHOT_READER_BASE_H
 
-#include <iostream>
-#include <iomanip>
+#include <map>
 #include <memory>
-#include <cstdlib>
-#include <sstream>
-#include "CacheMemory.h"
+#include <string>
+#include <vector>
+
 #include "ChannelLayouts.h"
-#include "ClipBase.h"
 #include "Fraction.h"
-#include "Frame.h"
 #include "Json.h"
-#include "ZmqLogger.h"
-#include <QString>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsPixmapItem>
-#include <QPixmap>
+
+#include <OpenShotAudio.h>
 
 namespace openshot
 {
+	class ClipBase;
+	class CacheBase;
+	class Frame;
+
 	/**
 	 * @brief This struct contains info about a media file, such as height, width, frames per second, etc...
 	 *
diff --git a/src/TextReader.cpp b/src/TextReader.cpp
index 9ef8142f..8f246bef 100644
--- a/src/TextReader.cpp
+++ b/src/TextReader.cpp
@@ -33,6 +33,7 @@
 
 #include "TextReader.h"
 #include "Exceptions.h"
+#include "Frame.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Caption.cpp b/src/effects/Caption.cpp
index 8d9bec92..0412dc3f 100644
--- a/src/effects/Caption.cpp
+++ b/src/effects/Caption.cpp
@@ -38,6 +38,8 @@
 #include <QRect>
 #include <QPen>
 #include <QBrush>
+#include <QPainter>
+#include <QPainterPath>
 
 using namespace openshot;
 
diff --git a/tests/CacheDisk.cpp b/tests/CacheDisk.cpp
index 01df3f6e..c83234f6 100644
--- a/tests/CacheDisk.cpp
+++ b/tests/CacheDisk.cpp
@@ -34,6 +34,7 @@
 #include <catch2/catch.hpp>
 
 #include "CacheDisk.h"
+#include "Frame.h"
 #include "Json.h"
 
 using namespace openshot;
diff --git a/tests/CacheMemory.cpp b/tests/CacheMemory.cpp
index 9b8e5442..baefe021 100644
--- a/tests/CacheMemory.cpp
+++ b/tests/CacheMemory.cpp
@@ -34,6 +34,7 @@
 #include <catch2/catch.hpp>
 
 #include "CacheMemory.h"
+#include "Frame.h"
 #include "Json.h"
 
 using namespace openshot;