diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj
index 63dca5252d..251920b512 100644
--- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj
+++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj
@@ -2286,7 +2286,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters
index 8f887b0986..b0b774169a 100644
--- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters
+++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters
@@ -3804,9 +3804,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj
index b1211f85ec..2b4c26eab1 100644
--- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj
+++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj
@@ -2348,7 +2348,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters
index bc6c7057f2..876a904bb2 100644
--- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters
+++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters
@@ -3924,9 +3924,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj
index 0954f3f215..45b4cc3192 100644
--- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj
+++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj
@@ -2296,7 +2296,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters
index f2cfc40bc9..6a7abd9a3c 100644
--- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters
+++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters
@@ -3807,9 +3807,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj
index 83ee941f30..fd2ad7a815 100644
--- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj
+++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj
@@ -2295,7 +2295,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters
index d70a670296..5afa1403a8 100644
--- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters
+++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters
@@ -3807,9 +3807,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt
index e2d13b0bf3..b07522591d 100644
--- a/examples/Demo/Builds/Android/app/CMakeLists.txt
+++ b/examples/Demo/Builds/Android/app/CMakeLists.txt
@@ -1348,7 +1348,6 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_video/capture/juce_CameraDevice.cpp"
     "../../../../../modules/juce_video/capture/juce_CameraDevice.h"
     "../../../../../modules/juce_video/native/juce_android_CameraDevice.h"
-    "../../../../../modules/juce_video/native/juce_android_Video.h"
     "../../../../../modules/juce_video/native/juce_mac_CameraDevice.h"
     "../../../../../modules/juce_video/native/juce_mac_Video.h"
     "../../../../../modules/juce_video/native/juce_win32_CameraDevice.h"
@@ -2659,7 +2658,6 @@ set_source_files_properties("../../../../../modules/juce_opengl/juce_opengl.h" P
 set_source_files_properties("../../../../../modules/juce_video/capture/juce_CameraDevice.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_video/capture/juce_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_video/native/juce_android_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE)
-set_source_files_properties("../../../../../modules/juce_video/native/juce_android_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_video/native/juce_win32_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE)
diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj
index af15844e8a..94b835b069 100644
--- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj
+++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj
@@ -2586,7 +2586,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters
index 5d69f1dfc3..53c504149b 100644
--- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters
+++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters
@@ -4383,9 +4383,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj
index 0a563eb1f4..65b4ab5cf4 100644
--- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj
+++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj
@@ -2585,7 +2585,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters
index 025273faf4..c78ae6912d 100644
--- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters
+++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters
@@ -4383,9 +4383,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj
index 56d9e64992..af351eb1e5 100644
--- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj
+++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj
@@ -2585,7 +2585,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters
index c354654ea6..56e9167da7 100644
--- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters
+++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters
@@ -4383,9 +4383,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj
index 58eef5c310..a8413e16a9 100644
--- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj
+++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj
@@ -2354,7 +2354,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters
index 10273dc054..2bc2cea196 100644
--- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters
+++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters
@@ -3939,9 +3939,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj
index 4e83f5820b..9bc44c1ba3 100644
--- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj
+++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj
@@ -2353,7 +2353,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters
index 5c1a34c1c7..5f6ceb15db 100644
--- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters
+++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters
@@ -3939,9 +3939,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj
index 70f8336e26..51d3035485 100644
--- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj
+++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj
@@ -2325,7 +2325,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_osc\juce_osc.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters
index 4cf1a40c35..d6c3e6e1c4 100644
--- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters
+++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters
@@ -3870,9 +3870,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj
index 819ded4d04..9814e1fcb7 100644
--- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj
+++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj
@@ -2324,7 +2324,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_osc\juce_osc.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters
index 56b167893f..34cd6cf492 100644
--- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters
+++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters
@@ -3870,9 +3870,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj
index b802e2be06..5ae45c2189 100644
--- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj
+++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj
@@ -2288,7 +2288,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters
index ab45d1e6e2..0000b3cf0b 100644
--- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters
+++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters
@@ -3813,9 +3813,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj
index ae079be850..09a9b63757 100644
--- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj
+++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj
@@ -2411,7 +2411,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters
index 82ebabbb55..c447815ae0 100644
--- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters
@@ -4038,9 +4038,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj
index c659bc5e38..337d906ca5 100644
--- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj
+++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj
@@ -2404,7 +2404,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters
index f3f562b8ad..64fd0d554d 100644
--- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters
@@ -4038,9 +4038,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj
index 5fd5d3ed50..3eaf48c361 100644
--- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj
+++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj
@@ -2411,7 +2411,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters
index 753971b943..3420b343ba 100644
--- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters
@@ -4038,9 +4038,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj
index c931a3f158..d98493bfdc 100644
--- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj
+++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj
@@ -2404,7 +2404,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters
index f0c1cf5581..10318466ec 100644
--- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters
@@ -4038,9 +4038,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj
index c0f4ca9dc9..c243f2b942 100644
--- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj
+++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj
@@ -2412,7 +2412,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters
index 668346622e..bac6250eb0 100644
--- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters
@@ -4044,9 +4044,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj
index 01ee448887..34e848f4bb 100644
--- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj
+++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj
@@ -2405,7 +2405,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters
index f9725d7835..8f5300d60d 100644
--- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters
@@ -4044,9 +4044,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj
index b4ad031e23..fb8a1eb7b1 100644
--- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj
+++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj
@@ -2411,7 +2411,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters
index 51de907d24..22bd8aee76 100644
--- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters
@@ -4038,9 +4038,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj
index b7f514aab7..53bba827fe 100644
--- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj
+++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj
@@ -2404,7 +2404,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters
index 3f66737b7c..32f239bbc4 100644
--- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters
@@ -4038,9 +4038,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj
index 83dcbeb277..269a010fa3 100644
--- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj
+++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj
@@ -2405,7 +2405,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters
index 48f4ea4b3e..bff63cef3b 100644
--- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters
@@ -4041,9 +4041,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj
index dfc70f3f21..0353c1a7da 100644
--- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj
+++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj
@@ -2405,7 +2405,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters
index 1d9c03f5d4..663222581b 100644
--- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters
+++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters
@@ -4041,9 +4041,6 @@
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt
index b9a6a97ca5..bd520c032e 100644
--- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt	
+++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt	
@@ -351,7 +351,6 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/ComponentBase.h"
     "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.cpp"
     "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.h"
-    "../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Shared.h"
     "../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm"
     "../../../../../modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm"
     "../../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h"
@@ -1589,7 +1588,6 @@ set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/
 set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/ComponentBase.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.h" PROPERTIES HEADER_FILE_ONLY TRUE)
-set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Shared.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h" PROPERTIES HEADER_FILE_ONLY TRUE)
diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj
index 32b4c9c6a2..6d47c04ce0 100644
--- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj	
+++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj	
@@ -2358,7 +2358,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters
index 04be5632d8..241454e5c8 100644
--- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters	
+++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters	
@@ -3948,9 +3948,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj
index f796e58d66..134939e782 100644
--- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj	
+++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj	
@@ -2357,7 +2357,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters
index cbad86a487..9074fa4038 100644
--- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters	
+++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters	
@@ -3948,9 +3948,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj
index 09f8a7e2bb..a962d6a461 100644
--- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj	
+++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj	
@@ -2357,7 +2357,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters
index 9eba4ad65b..e226db4bf7 100644
--- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters	
+++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters	
@@ -3948,9 +3948,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj
index ec884c8b38..ccad667dc1 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj
+++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj
@@ -2446,7 +2446,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_product_unlocking\juce_product_unlocking.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters
index 7ba45e3258..bb7eca2df7 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters
+++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters
@@ -4128,9 +4128,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj
index f9d1783f77..02cd40a289 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj
+++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj
@@ -2445,7 +2445,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_product_unlocking\juce_product_unlocking.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters
index 9d482b1de0..4f1697e20c 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters
+++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters
@@ -4128,9 +4128,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj
index a0ecae4f4b..312f74aa44 100644
--- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj	
+++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj	
@@ -2346,7 +2346,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_opengl\juce_opengl.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\capture\juce_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_Video.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_win32_CameraDevice.h"/>
diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters
index c78f0fc9ba..52f91e420a 100644
--- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters	
+++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters	
@@ -3912,9 +3912,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_android_Video.h">
-      <Filter>Juce Modules\juce_video\native</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_video\native\juce_mac_CameraDevice.h">
       <Filter>Juce Modules\juce_video\native</Filter>
     </ClInclude>