diff --git a/src/modules/video_render/main/source/video_render.gypi b/src/modules/video_render/main/source/video_render.gypi
index a7e5c74264..21585b3a52 100644
--- a/src/modules/video_render/main/source/video_render.gypi
+++ b/src/modules/video_render/main/source/video_render.gypi
@@ -148,6 +148,7 @@
           ],
           'sources': [
             '../test/testAPI/testAPI.cpp',
+            '../test/testAPI/testAPI.h',
             '../test/testAPI/testAPI_mac.mm',
           ],
           'conditions': [
diff --git a/src/modules/video_render/main/test/testAPI/testAPI.cpp b/src/modules/video_render/main/test/testAPI/testAPI.cpp
index b148069c06..15c37b0fa3 100644
--- a/src/modules/video_render/main/test/testAPI/testAPI.cpp
+++ b/src/modules/video_render/main/test/testAPI/testAPI.cpp
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testApi.h"
+#include "testAPI.h"
 
 #include <stdio.h>
 
@@ -194,13 +194,13 @@ int WebRtcCreateWindow(Window *outWindow, Display **outDisplay, int winNum, int
     // get screen number
     screen = DefaultScreen(_display);
 
-    // put desired visual info for the screen in vinfo 
+    // put desired visual info for the screen in vinfo
     if( XMatchVisualInfo(_display, screen, 24, TrueColor, &vinfo) != 0 )
     {
         //printf( "Screen visual info match!\n" );
     }
 
-    // set window attributes 
+    // set window attributes
     xswa.colormap = XCreateColormap(_display, DefaultRootWindow(_display), vinfo.visual, AllocNone);
     xswa.event_mask = StructureNotifyMask | ExposureMask;
     xswa.background_pixel = 0;
@@ -245,7 +245,7 @@ int WebRtcCreateWindow(Window *outWindow, Display **outDisplay, int winNum, int
         XSetIconName(_display, _window, "VE MM Remote Window");
     }
 
-    // make x report events for mask 
+    // make x report events for mask
     XSelectInput(_display, _window, StructureNotifyMask);
 
     // map the window to the display
@@ -437,15 +437,15 @@ int TestBitmapText(VideoRender* renderModule) {
     // Sleep and let all frames be rendered before closing
     SLEEP(renderDelayMs*2);
 
-   
+
     // Shut down
     printf("Closing...\n");
     ColorKey.dwColorSpaceHighValue = RGB(0,0,0);
-	  ColorKey.dwColorSpaceLowValue = RGB(0,0,0);
+    ColorKey.dwColorSpaceLowValue = RGB(0,0,0);
     renderModule->SetBitmap(NULL, 0, &ColorKey, 0.0f, 0.0f, 0.0f, 0.0f);
-	  renderModule->SetText(1, NULL, 20, RGB(255,255,255), 
+    renderModule->SetText(1, NULL, 20, RGB(255,255,255),
                     RGB(0,0,0), 0.0f, 0.0f, 0.0f, 0.0f);
-    
+
     error = renderModule->StopRender(streamId0);
     assert(error == 0);
 
diff --git a/src/modules/video_render/main/test/testAPI/testApi.h b/src/modules/video_render/main/test/testAPI/testAPI.h
similarity index 100%
rename from src/modules/video_render/main/test/testAPI/testApi.h
rename to src/modules/video_render/main/test/testAPI/testAPI.h
diff --git a/src/modules/video_render/main/test/testAPI/testAPI_mac.mm b/src/modules/video_render/main/test/testAPI/testAPI_mac.mm
index 99a596514a..82f3c4e860 100644
--- a/src/modules/video_render/main/test/testAPI/testAPI_mac.mm
+++ b/src/modules/video_render/main/test/testAPI/testAPI_mac.mm
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testApi.h"
+#include "testAPI.h"
 
 #include <iostream>
 
diff --git a/src/video_engine/test/auto_test/vie_auto_test.gypi b/src/video_engine/test/auto_test/vie_auto_test.gypi
index d738375c2d..e091b7a4f1 100644
--- a/src/video_engine/test/auto_test/vie_auto_test.gypi
+++ b/src/video_engine/test/auto_test/vie_auto_test.gypi
@@ -44,24 +44,33 @@
         'interface/vie_autotest_main.h',
         'interface/vie_autotest_window_manager_interface.h',
         'interface/vie_autotest_windows.h',
+        'interface/vie_window_manager_factory.h',
 
         # Helper classes
         'helpers/vie_fake_camera.cc',
+        'helpers/vie_fake_camera.h',
         'helpers/vie_file_capture_device.cc',
+        'helpers/vie_file_capture_device.h',
         'helpers/vie_to_file_renderer.cc',
+        'helpers/vie_to_file_renderer.h',
         'helpers/vie_window_creator.cc',
+        'helpers/vie_window_creator.h',
 
         # New, fully automated tests
         'automated/vie_api_integration_test.cc',
         'automated/vie_comparison_test.cc',
         'automated/vie_extended_integration_test.cc',
         'automated/vie_integration_test_base.cc',
+        'automated/vie_integration_test_base.h',
         'automated/vie_standard_integration_test.cc',
 
         # Test primitives
         'primitives/base_primitives.cc',
+        'primitives/base_primitives.h',
         'primitives/codec_primitives.cc',
+        'primitives/codec_primitives.h',
         'primitives/general_primitives.cc',
+        'primitives/general_primitives.h',
 
         # Platform independent
         'source/tb_capture_device.cc',