diff --git a/src/AudioReaderSource.cpp b/src/AudioReaderSource.cpp
index f5f0a4c8..acd69deb 100644
--- a/src/AudioReaderSource.cpp
+++ b/src/AudioReaderSource.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "AudioReaderSource.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/AudioResampler.h b/src/AudioResampler.h
index d88eb7cb..02c5cec1 100644
--- a/src/AudioResampler.h
+++ b/src/AudioResampler.h
@@ -32,7 +32,6 @@
 #define OPENSHOT_RESAMPLER_H
 
 #include "AudioBufferSource.h"
-#include "Exceptions.h"
 #include "JuceHeader.h"
 
 namespace openshot {
diff --git a/src/CacheBase.h b/src/CacheBase.h
index da72e5db..0033c882 100644
--- a/src/CacheBase.h
+++ b/src/CacheBase.h
@@ -34,7 +34,6 @@
 #include <memory>
 #include <cstdlib>
 #include "Frame.h"
-#include "Exceptions.h"
 #include "Json.h"
 
 namespace openshot {
diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
index ba5f5d9e..6d1241ed 100644
--- a/src/CacheDisk.cpp
+++ b/src/CacheDisk.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "CacheDisk.h"
+#include "Exceptions.h"
 #include "QtUtilities.h"
 #include <Qt>
 #include <QString>
diff --git a/src/CacheDisk.h b/src/CacheDisk.h
index c60f5f6e..ef63686b 100644
--- a/src/CacheDisk.h
+++ b/src/CacheDisk.h
@@ -36,7 +36,6 @@
 #include <memory>
 #include "CacheBase.h"
 #include "Frame.h"
-#include "Exceptions.h"
 #include <QDir>
 
 namespace openshot {
diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp
index 685c86ec..62dc9957 100644
--- a/src/CacheMemory.cpp
+++ b/src/CacheMemory.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "CacheMemory.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/CacheMemory.h b/src/CacheMemory.h
index ba771ced..e5402ad9 100644
--- a/src/CacheMemory.h
+++ b/src/CacheMemory.h
@@ -36,7 +36,6 @@
 #include <memory>
 #include "CacheBase.h"
 #include "Frame.h"
-#include "Exceptions.h"
 
 namespace openshot {
 
diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
index 1675962e..95a6613f 100644
--- a/src/ChunkReader.cpp
+++ b/src/ChunkReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "ChunkReader.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 
 #include <QDir>
diff --git a/src/ChunkWriter.cpp b/src/ChunkWriter.cpp
index 80ea6d57..3b03ae27 100644
--- a/src/ChunkWriter.cpp
+++ b/src/ChunkWriter.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "ChunkWriter.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/ChunkWriter.h b/src/ChunkWriter.h
index a63e4ca1..ff1aee36 100644
--- a/src/ChunkWriter.h
+++ b/src/ChunkWriter.h
@@ -35,7 +35,6 @@
 #include "WriterBase.h"
 #include "FFmpegWriter.h"
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Json.h"
 
 #include <cmath>
diff --git a/src/Clip.cpp b/src/Clip.cpp
index f11f5cb7..df746751 100644
--- a/src/Clip.cpp
+++ b/src/Clip.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Clip.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 #include "FrameMapper.h"
 #ifdef USE_IMAGEMAGICK
diff --git a/src/ClipBase.h b/src/ClipBase.h
index ac2c0237..9e30ea1d 100644
--- a/src/ClipBase.h
+++ b/src/ClipBase.h
@@ -34,7 +34,6 @@
 #include <memory>
 #include <sstream>
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Frame.h"
 #include "Point.h"
 #include "KeyFrame.h"
diff --git a/src/Color.cpp b/src/Color.cpp
index 622a912c..fe305591 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Color.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp
index 0d4f577a..1aae2c01 100644
--- a/src/Coordinate.cpp
+++ b/src/Coordinate.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Coordinate.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/Coordinate.h b/src/Coordinate.h
index a4b9599d..9437d8e4 100644
--- a/src/Coordinate.h
+++ b/src/Coordinate.h
@@ -32,7 +32,6 @@
 #define OPENSHOT_COORDINATE_H
 
 #include <iostream>
-#include "Exceptions.h"
 #include "Fraction.h"
 #include "Json.h"
 
diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp
index bb31f316..30f23fc6 100644
--- a/src/DecklinkReader.cpp
+++ b/src/DecklinkReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "DecklinkReader.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/DecklinkReader.h b/src/DecklinkReader.h
index d846cca9..6008e5eb 100644
--- a/src/DecklinkReader.h
+++ b/src/DecklinkReader.h
@@ -46,7 +46,6 @@
 #include <unistd.h>
 
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Frame.h"
 #include "DecklinkInput.h"
 
diff --git a/src/DecklinkWriter.h b/src/DecklinkWriter.h
index 84117d0e..49691ee5 100644
--- a/src/DecklinkWriter.h
+++ b/src/DecklinkWriter.h
@@ -46,7 +46,6 @@
 #include <unistd.h>
 
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Frame.h"
 #include "DecklinkOutput.h"
 
diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp
index c295c298..e6c5fce1 100644
--- a/src/DummyReader.cpp
+++ b/src/DummyReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "DummyReader.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/DummyReader.h b/src/DummyReader.h
index af06656d..280ed171 100644
--- a/src/DummyReader.h
+++ b/src/DummyReader.h
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <memory>
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "Fraction.h"
 
 namespace openshot
diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp
index 458381ce..81ba7299 100644
--- a/src/EffectBase.cpp
+++ b/src/EffectBase.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "EffectBase.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -148,4 +149,4 @@ openshot::ClipBase* EffectBase::ParentClip() {
 /// Set parent clip object of this reader
 void EffectBase::ParentClip(openshot::ClipBase* new_clip) {
 	clip = new_clip;
-}
\ No newline at end of file
+}
diff --git a/src/Exceptions.h b/src/Exceptions.h
index 258c6f4a..46137d53 100644
--- a/src/Exceptions.h
+++ b/src/Exceptions.h
@@ -382,7 +382,9 @@ namespace openshot {
 		 * @param file_path (optional) The input file being processed
 		 */
 		TooManySeeks(std::string message, std::string file_path="")
+#ifndef SWIG
 		__attribute__ ((deprecated (TMS_DEP_MSG) ))
+#endif
 			: ExceptionBase(message), file_path(file_path) { }
 		virtual ~TooManySeeks() noexcept {}
 	};
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index 01f37158..0d0cc59d 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -32,6 +32,7 @@
  */
 
 #include "FFmpegReader.h"
+#include "Exceptions.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds
diff --git a/src/FFmpegReader.h b/src/FFmpegReader.h
index 35e11a42..c1bfb926 100644
--- a/src/FFmpegReader.h
+++ b/src/FFmpegReader.h
@@ -46,7 +46,6 @@
 #include <memory>
 #include "CacheMemory.h"
 #include "Clip.h"
-#include "Exceptions.h"
 #include "OpenMPUtilities.h"
 #include "Settings.h"
 
diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
index e5e92fd4..210a6e43 100644
--- a/src/FFmpegWriter.cpp
+++ b/src/FFmpegWriter.cpp
@@ -32,6 +32,7 @@
  */
 
 #include "FFmpegWriter.h"
+#include "Exceptions.h"
 
 #include <iostream>
 
diff --git a/src/FFmpegWriter.h b/src/FFmpegWriter.h
index 6d9da6e5..44f7cb35 100644
--- a/src/FFmpegWriter.h
+++ b/src/FFmpegWriter.h
@@ -49,7 +49,6 @@
 #include <ctime>
 #include <unistd.h>
 #include "CacheMemory.h"
-#include "Exceptions.h"
 #include "OpenMPUtilities.h"
 #include "ZmqLogger.h"
 #include "Settings.h"
diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
index d6613825..98b0c112 100644
--- a/src/FrameMapper.cpp
+++ b/src/FrameMapper.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "FrameMapper.h"
+#include "Exceptions.h"
 #include "Clip.h"
 
 using namespace std;
diff --git a/src/FrameMapper.h b/src/FrameMapper.h
index 5b3e00e3..09f19899 100644
--- a/src/FrameMapper.h
+++ b/src/FrameMapper.h
@@ -40,7 +40,6 @@
 #include "ReaderBase.h"
 #include "Frame.h"
 #include "Fraction.h"
-#include "Exceptions.h"
 #include "KeyFrame.h"
 
 
diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp
index ad21be15..a4c21b80 100644
--- a/src/ImageReader.cpp
+++ b/src/ImageReader.cpp
@@ -32,6 +32,7 @@
 #ifdef USE_IMAGEMAGICK
 
 #include "ImageReader.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/ImageReader.h b/src/ImageReader.h
index 2fcb963a..39c505dc 100644
--- a/src/ImageReader.h
+++ b/src/ImageReader.h
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <memory>
 #include "CacheMemory.h"
-#include "Exceptions.h"
+
 #include "MagickUtilities.h"
 
 namespace openshot
diff --git a/src/ImageWriter.cpp b/src/ImageWriter.cpp
index 275ea270..78b0d1a9 100644
--- a/src/ImageWriter.cpp
+++ b/src/ImageWriter.cpp
@@ -35,6 +35,7 @@
 #ifdef USE_IMAGEMAGICK
 
 #include "ImageWriter.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/ImageWriter.h b/src/ImageWriter.h
index e483cb10..89754187 100644
--- a/src/ImageWriter.h
+++ b/src/ImageWriter.h
@@ -49,7 +49,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "CacheMemory.h"
-#include "Exceptions.h"
+
 #include "OpenMPUtilities.h"
 #include "MagickUtilities.h"
 
diff --git a/src/Json.cpp b/src/Json.cpp
index 9d6d9ba4..ee3d06ba 100644
--- a/src/Json.cpp
+++ b/src/Json.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Json.h"
+#include "Exceptions.h"
 
 const Json::Value openshot::stringToJson(const std::string value) {
 
diff --git a/src/Json.h b/src/Json.h
index 0bdf6e2c..9837f216 100644
--- a/src/Json.h
+++ b/src/Json.h
@@ -33,7 +33,7 @@
 
 #include <string>
 #include "json/json.h"
-#include "Exceptions.h"
+
 
 namespace openshot {
     const Json::Value stringToJson(const std::string value);
diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp
index b113e632..96c8dca9 100644
--- a/src/KeyFrame.cpp
+++ b/src/KeyFrame.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "KeyFrame.h"
+#include "Exceptions.h"
 #include <algorithm>
 #include <functional>
 #include <utility>
diff --git a/src/KeyFrame.h b/src/KeyFrame.h
index 6424473a..f19165a2 100644
--- a/src/KeyFrame.h
+++ b/src/KeyFrame.h
@@ -36,7 +36,7 @@
 #include <cmath>
 #include <assert.h>
 #include <vector>
-#include "Exceptions.h"
+
 #include "Fraction.h"
 #include "Coordinate.h"
 #include "Point.h"
diff --git a/src/OpenShot.h b/src/OpenShot.h
index 56f847d1..6b73401e 100644
--- a/src/OpenShot.h
+++ b/src/OpenShot.h
@@ -118,7 +118,7 @@
 #include "Effects.h"
 #include "EffectInfo.h"
 #include "Enums.h"
-#include "Exceptions.h"
+
 #include "ReaderBase.h"
 #include "WriterBase.h"
 #include "FFmpegReader.h"
diff --git a/src/Point.cpp b/src/Point.cpp
index 4636b437..0e62d3b4 100644
--- a/src/Point.cpp
+++ b/src/Point.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Point.h"
+#include "Exceptions.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/Point.h b/src/Point.h
index 4941c558..8b966416 100644
--- a/src/Point.h
+++ b/src/Point.h
@@ -32,7 +32,7 @@
 #define OPENSHOT_POINT_H
 
 #include "Coordinate.h"
-#include "Exceptions.h"
+
 #include "Json.h"
 
 namespace openshot
diff --git a/src/Profiles.cpp b/src/Profiles.cpp
index 167affe2..529bf3cd 100644
--- a/src/Profiles.cpp
+++ b/src/Profiles.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Profiles.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/Profiles.h b/src/Profiles.h
index 1de7c072..9d8c6d3b 100644
--- a/src/Profiles.h
+++ b/src/Profiles.h
@@ -41,7 +41,6 @@
 #include <QTextStream>
 #include <cstdio>
 #include <cstdlib>
-#include "Exceptions.h"
 #include "Fraction.h"
 #include "Json.h"
 
diff --git a/src/Qt/PlayerPrivate.cpp b/src/Qt/PlayerPrivate.cpp
index 9f53a0c5..fd92655e 100644
--- a/src/Qt/PlayerPrivate.cpp
+++ b/src/Qt/PlayerPrivate.cpp
@@ -30,6 +30,7 @@
  */
 
 #include "PlayerPrivate.h"
+#include "Exceptions.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 e1e53f5d..1ec52dd7 100644
--- a/src/Qt/VideoCacheThread.cpp
+++ b/src/Qt/VideoCacheThread.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "VideoCacheThread.h"
+#include "Exceptions.h"
 #include <algorithm>
 
 #include <thread>    // for std::this_thread::sleep_for
diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp
index d2d96186..f14bcfa0 100644
--- a/src/QtHtmlReader.cpp
+++ b/src/QtHtmlReader.cpp
@@ -31,6 +31,7 @@
  */
 
 #include "QtHtmlReader.h"
+#include "Exceptions.h"
 #include <QImage>
 #include <QPainter>
 #include <QTextDocument>
diff --git a/src/QtHtmlReader.h b/src/QtHtmlReader.h
index cd5a2750..6564477d 100644
--- a/src/QtHtmlReader.h
+++ b/src/QtHtmlReader.h
@@ -43,7 +43,7 @@
 #include <memory>
 #include "CacheMemory.h"
 #include "Enums.h"
-#include "Exceptions.h"
+
 
 class QImage;
 
diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp
index 8fb222db..90af26a0 100644
--- a/src/QtImageReader.cpp
+++ b/src/QtImageReader.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "QtImageReader.h"
+#include "Exceptions.h"
 #include "Settings.h"
 #include "Clip.h"
 #include "CacheMemory.h"
diff --git a/src/QtImageReader.h b/src/QtImageReader.h
index b61ca3af..1150b463 100644
--- a/src/QtImageReader.h
+++ b/src/QtImageReader.h
@@ -37,7 +37,7 @@
 #include <omp.h>
 #include <stdio.h>
 #include <memory>
-#include "Exceptions.h"
+
 #include "ReaderBase.h"
 
 namespace openshot
diff --git a/src/QtTextReader.cpp b/src/QtTextReader.cpp
index 0a4410cb..00627e1c 100644
--- a/src/QtTextReader.cpp
+++ b/src/QtTextReader.cpp
@@ -31,6 +31,7 @@
  */
 
 #include "QtTextReader.h"
+#include "Exceptions.h"
 #include <QImage>
 #include <QPainter>
 
diff --git a/src/QtTextReader.h b/src/QtTextReader.h
index d66681f3..bd6a6a53 100644
--- a/src/QtTextReader.h
+++ b/src/QtTextReader.h
@@ -43,7 +43,7 @@
 #include <memory>
 #include "CacheMemory.h"
 #include "Enums.h"
-#include "Exceptions.h"
+
 
 class QImage;
 
diff --git a/src/TextReader.cpp b/src/TextReader.cpp
index 0407460a..9ef8142f 100644
--- a/src/TextReader.cpp
+++ b/src/TextReader.cpp
@@ -32,6 +32,7 @@
 #ifdef USE_IMAGEMAGICK
 
 #include "TextReader.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/TextReader.h b/src/TextReader.h
index b5488f5f..2a9fb92a 100644
--- a/src/TextReader.h
+++ b/src/TextReader.h
@@ -44,7 +44,7 @@
 #include <memory>
 #include "CacheMemory.h"
 #include "Enums.h"
-#include "Exceptions.h"
+
 #include "MagickUtilities.h"
 
 namespace openshot
diff --git a/src/Timeline.cpp b/src/Timeline.cpp
index 60dfdbca..a57390f2 100644
--- a/src/Timeline.cpp
+++ b/src/Timeline.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Timeline.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/WriterBase.cpp b/src/WriterBase.cpp
index 9755c61d..fff93988 100644
--- a/src/WriterBase.cpp
+++ b/src/WriterBase.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "WriterBase.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
diff --git a/src/ZmqLogger.cpp b/src/ZmqLogger.cpp
index e19b20e3..4d8d8be6 100644
--- a/src/ZmqLogger.cpp
+++ b/src/ZmqLogger.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "ZmqLogger.h"
+#include "Exceptions.h"
 
 #if USE_RESVG == 1
 	#include "ResvgQt.h"
diff --git a/src/effects/Bars.cpp b/src/effects/Bars.cpp
index 8a519ba1..562ce8c3 100644
--- a/src/effects/Bars.cpp
+++ b/src/effects/Bars.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Bars.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -62,7 +63,7 @@ void Bars::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Bars::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Bars::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp
index c7e36b7b..b301f1e8 100644
--- a/src/effects/Blur.cpp
+++ b/src/effects/Blur.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Blur.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -63,7 +64,7 @@ void Blur::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Blur::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Blur::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp
index d73de899..dbb80f37 100644
--- a/src/effects/Brightness.cpp
+++ b/src/effects/Brightness.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Brightness.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -61,7 +62,7 @@ void Brightness::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Brightness::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Brightness::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Caption.cpp b/src/effects/Caption.cpp
index b9ce2249..6452613f 100644
--- a/src/effects/Caption.cpp
+++ b/src/effects/Caption.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Caption.h"
+#include "Exceptions.h"
 #include "../Clip.h"
 #include "../Timeline.h"
 
diff --git a/src/effects/ChromaKey.cpp b/src/effects/ChromaKey.cpp
index 0f4d626e..721c6a0e 100644
--- a/src/effects/ChromaKey.cpp
+++ b/src/effects/ChromaKey.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "ChromaKey.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -66,7 +67,7 @@ void ChromaKey::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> ChromaKey::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> ChromaKey::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Determine the current HSL (Hue, Saturation, Lightness) for the Chrome
 	int threshold = fuzz.GetInt(frame_number);
diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp
index 361f852d..1140d025 100644
--- a/src/effects/ColorShift.cpp
+++ b/src/effects/ColorShift.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "ColorShift.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -62,7 +63,7 @@ void ColorShift::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> ColorShift::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> ColorShift::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Crop.cpp b/src/effects/Crop.cpp
index a095245d..6b3c6f8a 100644
--- a/src/effects/Crop.cpp
+++ b/src/effects/Crop.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Crop.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -62,7 +63,7 @@ void Crop::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Crop::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Crop::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Deinterlace.cpp b/src/effects/Deinterlace.cpp
index c119c2ca..6d4dfa15 100644
--- a/src/effects/Deinterlace.cpp
+++ b/src/effects/Deinterlace.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Deinterlace.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -62,7 +63,7 @@ void Deinterlace::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Deinterlace::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Deinterlace::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get original size of frame's image
 	int original_width = frame->GetImage()->width();
diff --git a/src/effects/Hue.cpp b/src/effects/Hue.cpp
index 35ee3709..f2c50c62 100644
--- a/src/effects/Hue.cpp
+++ b/src/effects/Hue.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Hue.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -61,7 +62,7 @@ void Hue::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Hue::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Hue::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp
index 2a87a218..75e38a6a 100644
--- a/src/effects/Mask.cpp
+++ b/src/effects/Mask.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Mask.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 #ifdef USE_IMAGEMAGICK
 	#include "ImageReader.h"
@@ -67,7 +68,7 @@ void Mask::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Mask::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number) {
+std::shared_ptr<openshot::Frame> Mask::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number) {
 	// Get the mask image (from the mask reader)
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
 
diff --git a/src/effects/Negate.cpp b/src/effects/Negate.cpp
index 9cffd613..c6772b31 100644
--- a/src/effects/Negate.cpp
+++ b/src/effects/Negate.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Negate.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -48,7 +49,7 @@ Negate::Negate()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Negate::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Negate::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Make a negative of the images pixels
 	frame->GetImage()->invertPixels();
diff --git a/src/effects/Pixelate.cpp b/src/effects/Pixelate.cpp
index 15c416fb..6d1962bb 100644
--- a/src/effects/Pixelate.cpp
+++ b/src/effects/Pixelate.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Pixelate.h"
+#include "Exceptions.h"
 #include "Json.h"
 
 #include <QImage>
diff --git a/src/effects/Saturation.cpp b/src/effects/Saturation.cpp
index df2ddad3..119c3065 100644
--- a/src/effects/Saturation.cpp
+++ b/src/effects/Saturation.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Saturation.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -62,7 +63,7 @@ void Saturation::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Saturation::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Saturation::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Shift.cpp b/src/effects/Shift.cpp
index e591a171..38b5be58 100644
--- a/src/effects/Shift.cpp
+++ b/src/effects/Shift.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Shift.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -61,7 +62,7 @@ void Shift::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Shift::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Shift::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp
index 1e796d4c..ff8a8230 100644
--- a/src/effects/Wave.cpp
+++ b/src/effects/Wave.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "Wave.h"
+#include "Exceptions.h"
 
 using namespace openshot;
 
@@ -63,7 +64,7 @@ void Wave::init_effect_details()
 
 // This method is required for all derived classes of EffectBase, and returns a
 // modified openshot::Frame object
-std::shared_ptr<Frame> Wave::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
+std::shared_ptr<openshot::Frame> Wave::GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number)
 {
 	// Get the frame's image
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
diff --git a/src/effects/Wave.h b/src/effects/Wave.h
index 38f80822..ca10c21e 100644
--- a/src/effects/Wave.h
+++ b/src/effects/Wave.h
@@ -83,7 +83,7 @@ namespace openshot
 		///
 		/// @returns A new openshot::Frame object
 		/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
-		std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
+		std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<openshot::Frame> (new Frame()), frame_number); }
 
 		/// @brief This method is required for all derived classes of ClipBase, and returns a
 		/// modified openshot::Frame object
diff --git a/tests/Color_Tests.cpp b/tests/Color_Tests.cpp
index 6827ddf0..8b110f9e 100644
--- a/tests/Color_Tests.cpp
+++ b/tests/Color_Tests.cpp
@@ -35,6 +35,7 @@
 // Prevent name clashes with juce::UnitTest
 #define DONT_SET_USING_JUCE_NAMESPACE 1
 #include "Color.h"
+#include "Exceptions.h"
 #include "KeyFrame.h"
 #include "Json.h"
 
diff --git a/tests/DummyReader_Tests.cpp b/tests/DummyReader_Tests.cpp
index f2f1823d..b8a86d02 100644
--- a/tests/DummyReader_Tests.cpp
+++ b/tests/DummyReader_Tests.cpp
@@ -35,6 +35,7 @@
 #define DONT_SET_USING_JUCE_NAMESPACE 1
 
 #include "DummyReader.h"
+#include "Exceptions.h"
 #include "CacheMemory.h"
 #include "Fraction.h"
 #include "Frame.h"
diff --git a/tests/FFmpegReader_Tests.cpp b/tests/FFmpegReader_Tests.cpp
index a72fd90e..f5dc4435 100644
--- a/tests/FFmpegReader_Tests.cpp
+++ b/tests/FFmpegReader_Tests.cpp
@@ -35,6 +35,7 @@
 // Prevent name clashes with juce::UnitTest
 #define DONT_SET_USING_JUCE_NAMESPACE 1
 #include "FFmpegReader.h"
+#include "Exceptions.h"
 #include "Frame.h"
 #include "Timeline.h"
 #include "Json.h"
diff --git a/tests/FFmpegWriter_Tests.cpp b/tests/FFmpegWriter_Tests.cpp
index 606b359d..0160ac92 100644
--- a/tests/FFmpegWriter_Tests.cpp
+++ b/tests/FFmpegWriter_Tests.cpp
@@ -35,6 +35,7 @@
 // Prevent name clashes with juce::UnitTest
 #define DONT_SET_USING_JUCE_NAMESPACE 1
 #include "FFmpegWriter.h"
+#include "Exceptions.h"
 #include "FFmpegReader.h"
 #include "Fraction.h"
 #include "Frame.h"
diff --git a/tests/ImageWriter_Tests.cpp b/tests/ImageWriter_Tests.cpp
index 36b1288a..c4afaee0 100644
--- a/tests/ImageWriter_Tests.cpp
+++ b/tests/ImageWriter_Tests.cpp
@@ -37,6 +37,7 @@
 
 #ifdef USE_IMAGEMAGICK
 #include "ImageWriter.h"
+#include "Exceptions.h"
 #include "ImageReader.h"
 #include "FFmpegReader.h"
 #include "Frame.h"
diff --git a/tests/KeyFrame_Tests.cpp b/tests/KeyFrame_Tests.cpp
index 24573f92..0ffa3f98 100644
--- a/tests/KeyFrame_Tests.cpp
+++ b/tests/KeyFrame_Tests.cpp
@@ -32,6 +32,7 @@
 // Prevent name clashes with juce::UnitTest
 #define DONT_SET_USING_JUCE_NAMESPACE 1
 #include "KeyFrame.h"
+#include "Exceptions.h"
 #include "Coordinate.h"
 #include "Fraction.h"
 #include "Point.h"