diff --git a/src/AudioBufferSource.cpp b/src/AudioBufferSource.cpp
index 69e5713a..6b2bc59e 100644
--- a/src/AudioBufferSource.cpp
+++ b/src/AudioBufferSource.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/AudioBufferSource.h"
+#include "AudioBufferSource.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/AudioReaderSource.cpp b/src/AudioReaderSource.cpp
index 999d109d..b6a01a89 100644
--- a/src/AudioReaderSource.cpp
+++ b/src/AudioReaderSource.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/AudioReaderSource.h"
+#include "AudioReaderSource.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/AudioResampler.cpp b/src/AudioResampler.cpp
index 145f5d91..8c27043e 100644
--- a/src/AudioResampler.cpp
+++ b/src/AudioResampler.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/AudioResampler.h"
+#include "AudioResampler.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/CacheBase.cpp b/src/CacheBase.cpp
index bc57f3f4..72381792 100644
--- a/src/CacheBase.cpp
+++ b/src/CacheBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CacheBase.h"
+#include "CacheBase.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
index b3fd119f..c252d0b2 100644
--- a/src/CacheDisk.cpp
+++ b/src/CacheDisk.cpp
@@ -28,8 +28,8 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CacheDisk.h"
-#include "../include/QtUtilities.h"
+#include "CacheDisk.h"
+#include "QtUtilities.h"
 #include <Qt>
 #include <QString>
 #include <QTextStream>
diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp
index 70feef03..685c86ec 100644
--- a/src/CacheMemory.cpp
+++ b/src/CacheMemory.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CacheMemory.h"
+#include "CacheMemory.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
index c194ce33..5301c687 100644
--- a/src/ChunkReader.cpp
+++ b/src/ChunkReader.cpp
@@ -28,8 +28,10 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ChunkReader.h"
-#include "../include/FFmpegReader.h"
+#include "ChunkReader.h"
+#include "FFmpegReader.h"
+
+#include <QDir>
 
 using namespace openshot;
 
diff --git a/src/ChunkReader.h b/src/ChunkReader.h
index 50b26083..7a041f71 100644
--- a/src/ChunkReader.h
+++ b/src/ChunkReader.h
@@ -32,18 +32,12 @@
 #define OPENSHOT_CHUNK_READER_H
 
 #include "ReaderBase.h"
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <fstream>
-#include <omp.h>
-#include <cstdio>
-#include <cstdlib>
+#include <string>
 #include <memory>
-#include <QtCore/QDir>
+
+#include "Frame.h"
 #include "Json.h"
 #include "CacheMemory.h"
-#include "Exceptions.h"
 
 namespace openshot
 {
diff --git a/src/ChunkWriter.cpp b/src/ChunkWriter.cpp
index c7752cd5..bbb10be9 100644
--- a/src/ChunkWriter.cpp
+++ b/src/ChunkWriter.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ChunkWriter.h"
+#include "ChunkWriter.h"
 
 using namespace openshot;
 
diff --git a/src/Clip.cpp b/src/Clip.cpp
index 1f738282..f3660f0a 100644
--- a/src/Clip.cpp
+++ b/src/Clip.cpp
@@ -28,17 +28,17 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Clip.h"
-#include "../include/FFmpegReader.h"
-#include "../include/FrameMapper.h"
+#include "Clip.h"
+#include "FFmpegReader.h"
+#include "FrameMapper.h"
 #ifdef USE_IMAGEMAGICK
-	#include "../include/ImageReader.h"
-	#include "../include/TextReader.h"
+	#include "ImageReader.h"
+	#include "TextReader.h"
 #endif
-#include "../include/QtImageReader.h"
-#include "../include/ChunkReader.h"
-#include "../include/DummyReader.h"
-#include "../include/Timeline.h"
+#include "QtImageReader.h"
+#include "ChunkReader.h"
+#include "DummyReader.h"
+#include "Timeline.h"
 
 using namespace openshot;
 
diff --git a/src/ClipBase.cpp b/src/ClipBase.cpp
index a51c6573..f7695904 100644
--- a/src/ClipBase.cpp
+++ b/src/ClipBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ClipBase.h"
+#include "ClipBase.h"
 
 using namespace openshot;
 
diff --git a/src/Color.cpp b/src/Color.cpp
index 705ece4a..622a912c 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Color.h"
+#include "Color.h"
 
 using namespace openshot;
 
diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp
index f87fb7a0..0d4f577a 100644
--- a/src/Coordinate.cpp
+++ b/src/Coordinate.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Coordinate.h"
+#include "Coordinate.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp
index 1782f5ba..7b6c4e7e 100644
--- a/src/CrashHandler.cpp
+++ b/src/CrashHandler.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CrashHandler.h"
+#include "CrashHandler.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/DecklinkInput.cpp b/src/DecklinkInput.cpp
index b03ad8e4..21c4f7bb 100644
--- a/src/DecklinkInput.cpp
+++ b/src/DecklinkInput.cpp
@@ -53,7 +53,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkInput.h"
+#include "DecklinkInput.h"
 
 using namespace std;
 
diff --git a/src/DecklinkOutput.cpp b/src/DecklinkOutput.cpp
index 2dee7e9e..13da185f 100644
--- a/src/DecklinkOutput.cpp
+++ b/src/DecklinkOutput.cpp
@@ -53,7 +53,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkOutput.h"
+#include "DecklinkOutput.h"
 
 using namespace std;
 
diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp
index 14c2f87c..bb31f316 100644
--- a/src/DecklinkReader.cpp
+++ b/src/DecklinkReader.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkReader.h"
+#include "DecklinkReader.h"
 
 using namespace openshot;
 
diff --git a/src/DecklinkWriter.cpp b/src/DecklinkWriter.cpp
index 3eafda1c..1bfb59a8 100644
--- a/src/DecklinkWriter.cpp
+++ b/src/DecklinkWriter.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DecklinkWriter.h"
+#include "DecklinkWriter.h"
 
 using namespace openshot;
 
diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp
index 8b6f752f..c295c298 100644
--- a/src/DummyReader.cpp
+++ b/src/DummyReader.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DummyReader.h"
+#include "DummyReader.h"
 
 using namespace openshot;
 
diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp
index 05ed97c2..f1d7d030 100644
--- a/src/EffectBase.cpp
+++ b/src/EffectBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/EffectBase.h"
+#include "EffectBase.h"
 
 using namespace openshot;
 
diff --git a/src/EffectInfo.cpp b/src/EffectInfo.cpp
index 6829f4eb..1359238d 100644
--- a/src/EffectInfo.cpp
+++ b/src/EffectInfo.cpp
@@ -28,8 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/EffectInfo.h"
-
+#include "EffectInfo.h"
 
 using namespace openshot;
 
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index 5b7b7ddd..f17e0359 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -31,7 +31,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/FFmpegReader.h"
+#include "FFmpegReader.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds
diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
index 76bc9890..e5e92fd4 100644
--- a/src/FFmpegWriter.cpp
+++ b/src/FFmpegWriter.cpp
@@ -31,7 +31,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/FFmpegWriter.h"
+#include "FFmpegWriter.h"
 
 #include <iostream>
 
diff --git a/src/Fraction.cpp b/src/Fraction.cpp
index c9cdad55..869ef35f 100644
--- a/src/Fraction.cpp
+++ b/src/Fraction.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Fraction.h"
+#include "Fraction.h"
 
 using namespace openshot;
 
diff --git a/src/Frame.cpp b/src/Frame.cpp
index 8be00246..3bae8854 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Frame.h"
+#include "Frame.h"
 #include "JuceHeader.h"
 
 #include <QApplication>
diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
index 8eff6e70..85c6bfdf 100644
--- a/src/FrameMapper.cpp
+++ b/src/FrameMapper.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/FrameMapper.h"
+#include "FrameMapper.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp
index 9a001879..1b7c1af0 100644
--- a/src/ImageReader.cpp
+++ b/src/ImageReader.cpp
@@ -31,7 +31,7 @@
 // Require ImageMagick support
 #ifdef USE_IMAGEMAGICK
 
-#include "../include/ImageReader.h"
+#include "ImageReader.h"
 
 using namespace openshot;
 
diff --git a/src/ImageWriter.cpp b/src/ImageWriter.cpp
index 1b7a01e9..275ea270 100644
--- a/src/ImageWriter.cpp
+++ b/src/ImageWriter.cpp
@@ -34,7 +34,7 @@
 //Require ImageMagick support
 #ifdef USE_IMAGEMAGICK
 
-#include "../include/ImageWriter.h"
+#include "ImageWriter.h"
 
 using namespace openshot;
 
diff --git a/src/Json.cpp b/src/Json.cpp
index 0c83d9d6..9d6d9ba4 100644
--- a/src/Json.cpp
+++ b/src/Json.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Json.h"
+#include "Json.h"
 
 const Json::Value openshot::stringToJson(const std::string value) {
 
diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp
index 57e424cf..b113e632 100644
--- a/src/KeyFrame.cpp
+++ b/src/KeyFrame.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/KeyFrame.h"
+#include "KeyFrame.h"
 #include <algorithm>
 #include <functional>
 #include <utility>
diff --git a/src/PlayerBase.cpp b/src/PlayerBase.cpp
index f152fbbb..844b8d60 100644
--- a/src/PlayerBase.cpp
+++ b/src/PlayerBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/PlayerBase.h"
+#include "PlayerBase.h"
 
 using namespace openshot;
 
diff --git a/src/Point.cpp b/src/Point.cpp
index 13679977..4636b437 100644
--- a/src/Point.cpp
+++ b/src/Point.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Point.h"
+#include "Point.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/Profiles.cpp b/src/Profiles.cpp
index 5351520e..167affe2 100644
--- a/src/Profiles.cpp
+++ b/src/Profiles.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Profiles.h"
+#include "Profiles.h"
 
 using namespace openshot;
 
diff --git a/src/Qt/AudioPlaybackThread.cpp b/src/Qt/AudioPlaybackThread.cpp
index 2ee1009c..178642f6 100644
--- a/src/Qt/AudioPlaybackThread.cpp
+++ b/src/Qt/AudioPlaybackThread.cpp
@@ -29,7 +29,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/AudioPlaybackThread.h"
+#include "AudioPlaybackThread.h"
 
 #include <thread>    // for std::this_thread::sleep_for
 #include <chrono>    // for std::chrono::milliseconds
diff --git a/src/Qt/PlayerDemo.cpp b/src/Qt/PlayerDemo.cpp
index e5f0e11d..e8751a62 100644
--- a/src/Qt/PlayerDemo.cpp
+++ b/src/Qt/PlayerDemo.cpp
@@ -28,9 +28,11 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cstdio>
-#include "../../include/QtPlayer.h"
-#include "../../include/Qt/PlayerDemo.h"
+#include <string>
+
+#include "PlayerDemo.h"
+#include "../QtPlayer.h"
+
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QWidget>
diff --git a/src/Qt/PlayerPrivate.cpp b/src/Qt/PlayerPrivate.cpp
index db6f2ff1..75052fc3 100644
--- a/src/Qt/PlayerPrivate.cpp
+++ b/src/Qt/PlayerPrivate.cpp
@@ -29,7 +29,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/PlayerPrivate.h"
+#include "PlayerPrivate.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 4279e238..f817c93f 100644
--- a/src/Qt/VideoCacheThread.cpp
+++ b/src/Qt/VideoCacheThread.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/VideoCacheThread.h"
+#include "VideoCacheThread.h"
 #include <algorithm>
 
 #include <thread>    // for std::this_thread::sleep_for
diff --git a/src/Qt/VideoPlaybackThread.cpp b/src/Qt/VideoPlaybackThread.cpp
index f1cff756..01e2871b 100644
--- a/src/Qt/VideoPlaybackThread.cpp
+++ b/src/Qt/VideoPlaybackThread.cpp
@@ -29,7 +29,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/VideoPlaybackThread.h"
+#include "VideoPlaybackThread.h"
 
 namespace openshot
 {
diff --git a/src/Qt/VideoRenderWidget.cpp b/src/Qt/VideoRenderWidget.cpp
index 4af1ac6a..52898372 100644
--- a/src/Qt/VideoRenderWidget.cpp
+++ b/src/Qt/VideoRenderWidget.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/VideoRenderWidget.h"
+#include "VideoRenderWidget.h"
 #include <QWidget>
 #include <QImage>
 #include <QPainter>
diff --git a/src/Qt/VideoRenderer.cpp b/src/Qt/VideoRenderer.cpp
index 8d0e3a1d..e70e8545 100644
--- a/src/Qt/VideoRenderer.cpp
+++ b/src/Qt/VideoRenderer.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/Qt/VideoRenderer.h"
+#include "VideoRenderer.h"
 
 
 VideoRenderer::VideoRenderer(QObject *parent)
diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp
index 4925d3a8..b40041ac 100644
--- a/src/QtHtmlReader.cpp
+++ b/src/QtHtmlReader.cpp
@@ -30,7 +30,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/QtHtmlReader.h"
+#include "QtHtmlReader.h"
 #include <QImage>
 #include <QPainter>
 #include <QTextDocument>
diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp
index 2e8d0642..281cb363 100644
--- a/src/QtImageReader.cpp
+++ b/src/QtImageReader.cpp
@@ -28,10 +28,10 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/QtImageReader.h"
-#include "../include/Settings.h"
-#include "../include/Clip.h"
-#include "../include/CacheMemory.h"
+#include "QtImageReader.h"
+#include "Settings.h"
+#include "Clip.h"
+#include "CacheMemory.h"
 #include <QtCore/QString>
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
diff --git a/src/QtPlayer.cpp b/src/QtPlayer.cpp
index e4d862d1..345bc24f 100644
--- a/src/QtPlayer.cpp
+++ b/src/QtPlayer.cpp
@@ -29,12 +29,12 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Clip.h"
-#include "../include/FFmpegReader.h"
-#include "../include/Timeline.h"
-#include "../include/QtPlayer.h"
-#include "../include/Qt/PlayerPrivate.h"
-#include "../include/Qt/VideoRenderer.h"
+#include "Clip.h"
+#include "FFmpegReader.h"
+#include "Timeline.h"
+#include "QtPlayer.h"
+#include "Qt/PlayerPrivate.h"
+#include "Qt/VideoRenderer.h"
 
 namespace openshot
 {
diff --git a/src/QtTextReader.cpp b/src/QtTextReader.cpp
index bd157ebd..2c3d1c3a 100644
--- a/src/QtTextReader.cpp
+++ b/src/QtTextReader.cpp
@@ -30,7 +30,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/QtTextReader.h"
+#include "QtTextReader.h"
 #include <QImage>
 #include <QPainter>
 
diff --git a/src/ReaderBase.cpp b/src/ReaderBase.cpp
index 6799d95e..220925d7 100644
--- a/src/ReaderBase.cpp
+++ b/src/ReaderBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ReaderBase.h"
+#include "ReaderBase.h"
 
 using namespace openshot;
 
diff --git a/src/RendererBase.cpp b/src/RendererBase.cpp
index b2bea40e..ca9ad26e 100644
--- a/src/RendererBase.cpp
+++ b/src/RendererBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/RendererBase.h"
+#include "RendererBase.h"
 using namespace openshot;
 
 RendererBase::RendererBase()
diff --git a/src/Settings.cpp b/src/Settings.cpp
index e48fd981..e3f44aed 100644
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Settings.h"
+#include "Settings.h"
 
 using namespace std;
 using namespace openshot;
diff --git a/src/TextReader.cpp b/src/TextReader.cpp
index be8c7375..0407460a 100644
--- a/src/TextReader.cpp
+++ b/src/TextReader.cpp
@@ -31,7 +31,7 @@
 // Require ImageMagick support
 #ifdef USE_IMAGEMAGICK
 
-#include "../include/TextReader.h"
+#include "TextReader.h"
 
 using namespace openshot;
 
diff --git a/src/Timeline.cpp b/src/Timeline.cpp
index 9ccf9a84..71ab8efa 100644
--- a/src/Timeline.cpp
+++ b/src/Timeline.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Timeline.h"
+#include "Timeline.h"
 
 using namespace openshot;
 
diff --git a/src/WriterBase.cpp b/src/WriterBase.cpp
index 38821917..9755c61d 100644
--- a/src/WriterBase.cpp
+++ b/src/WriterBase.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/WriterBase.h"
+#include "WriterBase.h"
 
 using namespace openshot;
 
diff --git a/src/ZmqLogger.cpp b/src/ZmqLogger.cpp
index b7299230..8d72f352 100644
--- a/src/ZmqLogger.cpp
+++ b/src/ZmqLogger.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ZmqLogger.h"
+#include "ZmqLogger.h"
 
 #if USE_RESVG == 1
 	#include "ResvgQt.h"
diff --git a/src/effects/Bars.cpp b/src/effects/Bars.cpp
index e653b7dd..6b319569 100644
--- a/src/effects/Bars.cpp
+++ b/src/effects/Bars.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Bars.h"
+#include "Bars.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Bars.h b/src/effects/Bars.h
index 7c92255a..c2e24f73 100644
--- a/src/effects/Bars.h
+++ b/src/effects/Bars.h
@@ -33,13 +33,13 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <stdio.h>
-#include <memory>
 #include "../Color.h"
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
 
+#include <string>
+#include <memory>
 
 namespace openshot
 {
diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp
index 6ddba88e..c7e36b7b 100644
--- a/src/effects/Blur.cpp
+++ b/src/effects/Blur.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Blur.h"
+#include "Blur.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Blur.h b/src/effects/Blur.h
index 60a0cd08..59b75fff 100644
--- a/src/effects/Blur.h
+++ b/src/effects/Blur.h
@@ -33,21 +33,12 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
-#include <memory>
-#include <QRect>
-#include "../Color.h"
-#include "../Exceptions.h"
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
-#include "../ReaderBase.h"
-#include "../FFmpegReader.h"
-#include "../QtImageReader.h"
-#include "../ChunkReader.h"
+
+#include <memory>
+#include <string>
 
 namespace openshot
 {
diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp
index 321a19a7..d73de899 100644
--- a/src/effects/Brightness.cpp
+++ b/src/effects/Brightness.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Brightness.h"
+#include "Brightness.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Brightness.h b/src/effects/Brightness.h
index 5f25b94a..22860068 100644
--- a/src/effects/Brightness.h
+++ b/src/effects/Brightness.h
@@ -33,20 +33,12 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
-#include <memory>
-#include "../Color.h"
-#include "../Exceptions.h"
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
-#include "../ReaderBase.h"
-#include "../FFmpegReader.h"
-#include "../QtImageReader.h"
-#include "../ChunkReader.h"
+
+#include <memory>
+#include <string>
 
 namespace openshot
 {
diff --git a/src/effects/ChromaKey.cpp b/src/effects/ChromaKey.cpp
index dbb56a69..0f4d626e 100644
--- a/src/effects/ChromaKey.cpp
+++ b/src/effects/ChromaKey.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/ChromaKey.h"
+#include "ChromaKey.h"
 
 using namespace openshot;
 
diff --git a/src/effects/ChromaKey.h b/src/effects/ChromaKey.h
index fcc8c3b1..7c267642 100644
--- a/src/effects/ChromaKey.h
+++ b/src/effects/ChromaKey.h
@@ -33,16 +33,14 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
-#include <memory>
 #include "../Color.h"
+#include "../Frame.h"
 #include "../Exceptions.h"
 #include "../KeyFrame.h"
 
+#include <memory>
+#include <string>
+
 namespace openshot
 {
 
diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp
index 7ec62e14..361f852d 100644
--- a/src/effects/ColorShift.cpp
+++ b/src/effects/ColorShift.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/ColorShift.h"
+#include "ColorShift.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Crop.cpp b/src/effects/Crop.cpp
index f0e0aa95..02e3f17c 100644
--- a/src/effects/Crop.cpp
+++ b/src/effects/Crop.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Crop.h"
+#include "Crop.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Crop.h b/src/effects/Crop.h
index f5ba07f2..2b746a01 100644
--- a/src/effects/Crop.h
+++ b/src/effects/Crop.h
@@ -33,13 +33,14 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <stdio.h>
-#include <memory>
 #include "../Color.h"
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
 
+#include <memory>
+#include <string>
+
 
 namespace openshot
 {
diff --git a/src/effects/Deinterlace.cpp b/src/effects/Deinterlace.cpp
index 984336aa..36014349 100644
--- a/src/effects/Deinterlace.cpp
+++ b/src/effects/Deinterlace.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Deinterlace.h"
+#include "Deinterlace.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Deinterlace.h b/src/effects/Deinterlace.h
index 97c77853..84212d67 100644
--- a/src/effects/Deinterlace.h
+++ b/src/effects/Deinterlace.h
@@ -33,14 +33,9 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
+#include <string>
 #include <memory>
-#include "../Color.h"
-#include "../Exceptions.h"
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
 
diff --git a/src/effects/Hue.cpp b/src/effects/Hue.cpp
index eb4808e3..35ee3709 100644
--- a/src/effects/Hue.cpp
+++ b/src/effects/Hue.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Hue.h"
+#include "Hue.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Hue.h b/src/effects/Hue.h
index 833bf087..039aa3a8 100644
--- a/src/effects/Hue.h
+++ b/src/effects/Hue.h
@@ -33,12 +33,13 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <stdio.h>
-#include <memory>
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
 
+#include <string>
+#include <memory>
+
 
 namespace openshot
 {
diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp
index f270e410..9fbc1824 100644
--- a/src/effects/Mask.cpp
+++ b/src/effects/Mask.cpp
@@ -28,7 +28,12 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Mask.h"
+#include "Mask.h"
+#include "FFmpegReader.h"
+#ifdef USE_IMAGEMAGICK
+	#include "ImageReader.h"
+#endif
+#include "ReaderBase.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Mask.h b/src/effects/Mask.h
index 8156b843..1a76ea47 100644
--- a/src/effects/Mask.h
+++ b/src/effects/Mask.h
@@ -33,27 +33,16 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
-#include <memory>
-#include "../Color.h"
-#include "../Exceptions.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
-#include "../ReaderBase.h"
-#include "../FFmpegReader.h"
-#include "../QtImageReader.h"
-#include "../ChunkReader.h"
-#ifdef USE_IMAGEMAGICK
-	#include "../MagickUtilities.h"
-	#include "../ImageReader.h"
-#endif
+
+#include <string>
+#include <memory>
 
 namespace openshot
 {
+	// Forward declaration
+	class ReaderBase;
 
 	/**
 	 * @brief This class uses the image libraries to apply alpha (or transparency) masks
diff --git a/src/effects/Negate.cpp b/src/effects/Negate.cpp
index 18a5d194..9cffd613 100644
--- a/src/effects/Negate.cpp
+++ b/src/effects/Negate.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Negate.h"
+#include "Negate.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Negate.h b/src/effects/Negate.h
index c691a86c..c3a67efd 100644
--- a/src/effects/Negate.h
+++ b/src/effects/Negate.h
@@ -33,16 +33,14 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <ctime>
-#include <iostream>
-#include <omp.h>
-#include <stdio.h>
-#include <memory>
-#include "../Color.h"
-#include "../Exceptions.h"
+#include "../Frame.h"
 #include "../KeyFrame.h"
 
+#include <memory>
+#include <string>
+
+#include <QImage>
+
 namespace openshot
 {
 
diff --git a/src/effects/Pixelate.cpp b/src/effects/Pixelate.cpp
index 057b28e2..15c416fb 100644
--- a/src/effects/Pixelate.cpp
+++ b/src/effects/Pixelate.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Pixelate.h"
+#include "Pixelate.h"
 #include "Json.h"
 
 #include <QImage>
diff --git a/src/effects/Pixelate.h b/src/effects/Pixelate.h
index 793f4d46..11223150 100644
--- a/src/effects/Pixelate.h
+++ b/src/effects/Pixelate.h
@@ -33,12 +33,12 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <stdio.h>
-#include <memory>
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
 
+#include <memory>
+#include <string>
 
 namespace openshot
 {
diff --git a/src/effects/Saturation.cpp b/src/effects/Saturation.cpp
index cad9c08d..df2ddad3 100644
--- a/src/effects/Saturation.cpp
+++ b/src/effects/Saturation.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Saturation.h"
+#include "Saturation.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Shift.cpp b/src/effects/Shift.cpp
index ee581591..e591a171 100644
--- a/src/effects/Shift.cpp
+++ b/src/effects/Shift.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Shift.h"
+#include "Shift.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Shift.h b/src/effects/Shift.h
index 7a7efbea..86e4ad37 100644
--- a/src/effects/Shift.h
+++ b/src/effects/Shift.h
@@ -33,12 +33,13 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <stdio.h>
-#include <memory>
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
 
+#include <string>
+#include <memory>
+
 
 namespace openshot
 {
diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp
index 499fc958..1e796d4c 100644
--- a/src/effects/Wave.cpp
+++ b/src/effects/Wave.cpp
@@ -28,7 +28,7 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../include/effects/Wave.h"
+#include "Wave.h"
 
 using namespace openshot;
 
diff --git a/src/effects/Wave.h b/src/effects/Wave.h
index d4759c24..7f6e37b7 100644
--- a/src/effects/Wave.h
+++ b/src/effects/Wave.h
@@ -33,12 +33,13 @@
 
 #include "../EffectBase.h"
 
-#include <cmath>
-#include <stdio.h>
-#include <memory>
+#include "../Frame.h"
 #include "../Json.h"
 #include "../KeyFrame.h"
 
+#include <string>
+#include <memory>
+
 
 namespace openshot
 {