diff --git a/tests/CVObjectDetection_Tests.cpp b/tests/CVObjectDetection_Tests.cpp
index 3ab6b1059..e6c997a00 100644
--- a/tests/CVObjectDetection_Tests.cpp
+++ b/tests/CVObjectDetection_Tests.cpp
@@ -29,13 +29,16 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sstream>
+#include <memory>
+
 #include "UnitTest++.h"
 // Prevent name clashes with juce::UnitTest
 #define DONT_SET_USING_JUCE_NAMESPACE 1
-#include "OpenShot.h"
-//#include "ProcessingController.h"
-//#include "Json.h"
-#include <QImage>
+#include "Clip.h"
+#include "CVObjectDetection.h"
+#include "ProcessingController.h"
+#include "Json.h"
 
 using namespace openshot;
 
diff --git a/tests/CVStabilizer_Tests.cpp b/tests/CVStabilizer_Tests.cpp
index 401884d7e..4d1f9305c 100644
--- a/tests/CVStabilizer_Tests.cpp
+++ b/tests/CVStabilizer_Tests.cpp
@@ -29,12 +29,15 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sstream>
+#include <memory>
+
 #include "UnitTest++.h"
 // Prevent name clashes with juce::UnitTest
 #define DONT_SET_USING_JUCE_NAMESPACE 1
-#include "OpenShot.h"
-//#include "ProcessingController.h"
-#include <QImage>
+#include "Clip.h"
+#include "CVStabilization.h"  // for TransformParam, CamTrajectory, CVStabilization
+#include "ProcessingController.h"
 
 using namespace openshot;
 
@@ -56,10 +59,10 @@ SUITE(CVStabilizer_Tests)
 
         std::string json_data = R"proto(
         {
-            "protobuf_data_path": "stabilizer.data", 
-            "smoothing-window": 30 
+            "protobuf_data_path": "stabilizer.data",
+            "smoothing-window": 30
         } )proto";
-        
+
         // Create stabilizer
         CVStabilization stabilizer(json_data, processingController);
 
@@ -100,7 +103,7 @@ SUITE(CVStabilizer_Tests)
 
         std::string json_data = R"proto(
         {
-            "protobuf_data_path": "stabilizer.data", 
+            "protobuf_data_path": "stabilizer.data",
             "smoothing-window": 30
         } )proto";
 
diff --git a/tests/CVTracker_Tests.cpp b/tests/CVTracker_Tests.cpp
index 5e1bf7097..cab850620 100644
--- a/tests/CVTracker_Tests.cpp
+++ b/tests/CVTracker_Tests.cpp
@@ -29,12 +29,15 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sstream>
+#include <memory>
+
 #include "UnitTest++.h"
 // Prevent name clashes with juce::UnitTest
 #define DONT_SET_USING_JUCE_NAMESPACE 1
-#include "OpenShot.h"
-//#include "ProcessingController.h"
-#include <QImage>
+#include "Clip.h"
+#include "CVTracker.h"  // for FrameData, CVTracker
+#include "ProcessingController.h"
 
 using namespace openshot;
 
@@ -56,14 +59,14 @@ SUITE(CVTracker_Tests)
 
         std::string json_data = R"proto(
         {
-            "protobuf_data_path": "kcf_tracker.data", 
-            "tracker-type": "KCF", 
+            "protobuf_data_path": "kcf_tracker.data",
+            "tracker-type": "KCF",
             "region": {"x": 294, "y": 102, "width": 180, "height": 166, "first-frame": 0}
         } )proto";
 
         // Create tracker
         CVTracker kcfTracker(json_data, processingController);
-        
+
         // Track clip for frames 0-20
         kcfTracker.trackClip(c1, 0, 20, true);
         // Get tracked data
@@ -94,8 +97,8 @@ SUITE(CVTracker_Tests)
 
         std::string json_data = R"proto(
         {
-            "protobuf_data_path": "kcf_tracker.data", 
-            "tracker-type": "KCF", 
+            "protobuf_data_path": "kcf_tracker.data",
+            "tracker-type": "KCF",
             "region": {"x": 294, "y": 102, "width": 180, "height": 166, "first-frame": 0}
         } )proto";
 
@@ -119,8 +122,8 @@ SUITE(CVTracker_Tests)
 
         std::string proto_data_1 = R"proto(
         {
-            "protobuf_data_path": "kcf_tracker.data", 
-            "tracker_type": "", 
+            "protobuf_data_path": "kcf_tracker.data",
+            "tracker_type": "",
             "region": {"x": -1, "y": -1, "width": -1, "height": -1, "first-frame": 0}
         } )proto";
 
diff --git a/tests/Frame_Tests.cpp b/tests/Frame_Tests.cpp
index f1049ca09..9038f8b85 100644
--- a/tests/Frame_Tests.cpp
+++ b/tests/Frame_Tests.cpp
@@ -41,6 +41,10 @@
 
 #include <QImage>
 
+#ifdef USE_OPENCV
+#include <opencv2/core.hpp>
+#endif
+
 using namespace openshot;
 
 SUITE(Frame_Tests)