diff --git a/Core/GameEngine/CMakeLists.txt b/Core/GameEngine/CMakeLists.txt
index 689e0004307..0c91e47cc5d 100644
--- a/Core/GameEngine/CMakeLists.txt
+++ b/Core/GameEngine/CMakeLists.txt
@@ -224,11 +224,11 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/Statistics.h
 #    Include/GameClient/TerrainRoads.h
 #    Include/GameClient/TerrainVisual.h
-#    Include/GameClient/VideoPlayer.h
+    Include/GameClient/VideoPlayer.h
 #    Include/GameClient/View.h
 #    Include/GameClient/Water.h
 #    Include/GameClient/WindowLayout.h
-#    Include/GameClient/WindowVideoManager.h
+    Include/GameClient/WindowVideoManager.h
 #    Include/GameClient/WindowXlat.h
 #    Include/GameClient/WinInstanceData.h
 #    Include/GameLogic/AI.h
@@ -597,7 +597,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/INI/INITerrainBridge.cpp
 #    Source/Common/INI/INITerrainRoad.cpp
 #    Source/Common/INI/INIUpgrade.cpp
-#    Source/Common/INI/INIVideo.cpp
+    Source/Common/INI/INIVideo.cpp
 #    Source/Common/INI/INIWater.cpp
 #    Source/Common/INI/INIWeapon.cpp
 #    Source/Common/INI/INIWebpageURL.cpp
@@ -791,7 +791,7 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GUI/Shell/Shell.cpp
 #    Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
 #    Source/GameClient/GUI/WindowLayout.cpp
-#    Source/GameClient/GUI/WindowVideoManager.cpp
+    Source/GameClient/GUI/WindowVideoManager.cpp
 #    Source/GameClient/GUI/WinInstanceData.cpp
 #    Source/GameClient/InGameUI.cpp
 #    Source/GameClient/Input/Keyboard.cpp
@@ -823,8 +823,8 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/System/Smudge.cpp
 #    Source/GameClient/Terrain/TerrainRoads.cpp
 #    Source/GameClient/Terrain/TerrainVisual.cpp
-#    Source/GameClient/VideoPlayer.cpp
-#    Source/GameClient/VideoStream.cpp
+    Source/GameClient/VideoPlayer.cpp
+    Source/GameClient/VideoStream.cpp
 #    Source/GameClient/View.cpp
 #    Source/GameClient/Water.cpp
 #    Source/GameLogic/AI/AI.cpp
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/VideoPlayer.h b/Core/GameEngine/Include/GameClient/VideoPlayer.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/VideoPlayer.h
rename to Core/GameEngine/Include/GameClient/VideoPlayer.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h b/Core/GameEngine/Include/GameClient/WindowVideoManager.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h
rename to Core/GameEngine/Include/GameClient/WindowVideoManager.h
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIVideo.cpp b/Core/GameEngine/Source/Common/INI/INIVideo.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/Common/INI/INIVideo.cpp
rename to Core/GameEngine/Source/Common/INI/INIVideo.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp b/Core/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
rename to Core/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/VideoPlayer.cpp b/Core/GameEngine/Source/GameClient/VideoPlayer.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/VideoPlayer.cpp
rename to Core/GameEngine/Source/GameClient/VideoPlayer.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/VideoStream.cpp b/Core/GameEngine/Source/GameClient/VideoStream.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/VideoStream.cpp
rename to Core/GameEngine/Source/GameClient/VideoStream.cpp
diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt
index 9996b8a8eac..404c1eb60ec 100644
--- a/Core/GameEngineDevice/CMakeLists.txt
+++ b/Core/GameEngineDevice/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(GAMEENGINEDEVICE_SRC
     Include/MilesAudioDevice/MilesAudioManager.h
-#    Include/VideoDevice/Bink/BinkVideoPlayer.h
+    Include/VideoDevice/Bink/BinkVideoPlayer.h
 #    Include/W3DDevice/Common/W3DConvert.h
 #    Include/W3DDevice/Common/W3DFunctionLexicon.h
 #    Include/W3DDevice/Common/W3DModuleFactory.h
@@ -70,7 +70,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/W3DDevice/GameClient/W3DTerrainTracks.h
 #    Include/W3DDevice/GameClient/W3DTerrainVisual.h
 #    Include/W3DDevice/GameClient/W3DTreeBuffer.h
-#    Include/W3DDevice/GameClient/W3DVideobuffer.h
+    Include/W3DDevice/GameClient/W3DVideoBuffer.h
 #    Include/W3DDevice/GameClient/W3DView.h
 #    Include/W3DDevice/GameClient/W3DVolumetricShadow.h
 #    Include/W3DDevice/GameClient/W3DWater.h
@@ -91,7 +91,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/Win32Device/GameClient/Win32DIMouse.h
 #    Include/Win32Device/GameClient/Win32Mouse.h
     Source/MilesAudioDevice/MilesAudioManager.cpp
-#    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
 #    Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
 #    Source/W3DDevice/Common/System/W3DRadar.cpp
 #    Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
@@ -172,7 +172,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
 #    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
 #    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
-#    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
 #    Source/W3DDevice/GameClient/W3DView.cpp
 #    Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
 #    Source/W3DDevice/GameClient/W3DWebBrowser.cpp
@@ -229,20 +229,19 @@ target_link_libraries(corei_gameenginedevice_public INTERFACE
     milesstub
 )
 
-#if(RTS_BUILD_OPTION_FFMPEG)
-#    find_package(FFMPEG REQUIRED)
-#
-#    if(FFMPEG_FOUND)
-#        target_sources(z_gameenginedevice PRIVATE
-#            Include/VideoDevice/FFmpeg/FFmpegFile.h
-#            Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
-#            Source/VideoDevice/FFmpeg/FFmpegFile.cpp
-#            Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
-#        )
-#
-#        target_include_directories(z_gameenginedevice PRIVATE ${FFMPEG_INCLUDE_DIRS})
-#        target_link_directories(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARY_DIRS})
-#        target_link_libraries(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARIES})
-#        target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_FFMPEG)
-#    endif()
-#endif()
+if(RTS_BUILD_OPTION_FFMPEG)
+    find_package(FFMPEG REQUIRED)
+
+    if(FFMPEG_FOUND)
+        target_sources(corei_gameenginedevice_private INTERFACE
+            Include/VideoDevice/FFmpeg/FFmpegFile.h
+            Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
+            Source/VideoDevice/FFmpeg/FFmpegFile.cpp
+            Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
+        )
+        target_include_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_INCLUDE_DIRS})
+        target_link_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARY_DIRS})
+        target_link_libraries(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARIES})
+        target_compile_definitions(corei_gameenginedevice_public INTERFACE RTS_HAS_FFMPEG)
+    endif()
+endif()
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
rename to Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
rename to Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
rename to Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp b/Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
similarity index 99%
rename from GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
rename to Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
index 9cd7f34dee7..819d1e1dbe4 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+++ b/Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
@@ -225,7 +225,7 @@ VideoStreamInterface*	BinkVideoPlayer::open( AsciiString movieTitle )
 	const Video* pVideo = getVideo(movieTitle);
 	if (pVideo) {
 		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to open bink file"));
-		
+
 		if (TheGlobalData->m_modDir.isNotEmpty())
 		{
 			char filePath[ _MAX_PATH ];
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp b/Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
rename to Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp b/Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
rename to Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
similarity index 99%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
index 8ff77192ef2..e71dbf9ef75 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
@@ -48,7 +48,7 @@
 #include "Common/GameMemory.h"
 #include "WW3D2/texture.h"
 #include "WW3D2/textureloader.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
+#include "W3DDevice/GameClient/W3DVideoBuffer.h"
 
 //----------------------------------------------------------------------------
 //         Externals                                                     
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
index 1bb7173ff51..41fd59b68b8 100644
--- a/Generals/Code/GameEngine/CMakeLists.txt
+++ b/Generals/Code/GameEngine/CMakeLists.txt
@@ -213,11 +213,11 @@ set(GAMEENGINE_SRC
     Include/GameClient/Statistics.h
     Include/GameClient/TerrainRoads.h
     Include/GameClient/TerrainVisual.h
-    Include/GameClient/VideoPlayer.h
+#    Include/GameClient/VideoPlayer.h
     Include/GameClient/View.h
     Include/GameClient/Water.h
     Include/GameClient/WindowLayout.h
-    Include/GameClient/WindowVideoManager.h
+#    Include/GameClient/WindowVideoManager.h
     Include/GameClient/WindowXlat.h
     Include/GameClient/WinInstanceData.h
     Include/GameLogic/AI.h
@@ -556,7 +556,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INITerrainBridge.cpp
     Source/Common/INI/INITerrainRoad.cpp
     Source/Common/INI/INIUpgrade.cpp
-    Source/Common/INI/INIVideo.cpp
+#    Source/Common/INI/INIVideo.cpp
     Source/Common/INI/INIWater.cpp
     Source/Common/INI/INIWeapon.cpp
     Source/Common/INI/INIWebpageURL.cpp
@@ -746,7 +746,7 @@ set(GAMEENGINE_SRC
     Source/GameClient/GUI/Shell/Shell.cpp
     Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
     Source/GameClient/GUI/WindowLayout.cpp
-    Source/GameClient/GUI/WindowVideoManager.cpp
+#    Source/GameClient/GUI/WindowVideoManager.cpp
     Source/GameClient/GUI/WinInstanceData.cpp
     Source/GameClient/InGameUI.cpp
     Source/GameClient/Input/Keyboard.cpp
@@ -775,7 +775,7 @@ set(GAMEENGINE_SRC
     Source/GameClient/System/RayEffect.cpp
     Source/GameClient/Terrain/TerrainRoads.cpp
     Source/GameClient/Terrain/TerrainVisual.cpp
-    Source/GameClient/VideoPlayer.cpp
+#    Source/GameClient/VideoPlayer.cpp
     Source/GameClient/View.cpp
     Source/GameClient/Water.cpp
     Source/GameLogic/AI/AI.cpp
diff --git a/Generals/Code/GameEngine/Include/GameClient/VideoPlayer.h b/Generals/Code/GameEngine/Include/GameClient/VideoPlayer.h
deleted file mode 100644
index 1d9a365a133..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/VideoPlayer.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  GameClient/VideoPlayer.h
-//
-// Created:    10/22/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __GAMECLIENT_VIDEOPLAYER_H_
-#define __GAMECLIENT_VIDEOPLAYER_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include <Lib/BaseType.h>
-#include "WWMath/rect.h"
-#include "Common/SubsystemInterface.h"
-#include "Common/AsciiString.h"
-#include "Common/INI.h"
-#include "Common/STLTypedefs.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-struct Video;
-class VideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-typedef std::vector<Video>	VecVideo;
-typedef std::vector<Video>::iterator	VecVideoIt;
-
-//----------------------------------------------------------------------------
-//           Video (Struct)                                                   
-//----------------------------------------------------------------------------
-struct Video
-{
-	AsciiString m_filename;																	///< should be filled with the filename on disk
-	AsciiString m_internalName;															///< should be our internal reference name
-	AsciiString m_commentForWB;
-};
-
-//===============================
-// VideoBuffer
-//===============================
-/**
-  * Video buffer interface class. The VideoPlayer uses this buffer abstraction
-	* in order to be able to render a video stream.
-	*/
-//===============================
-
-class VideoBuffer
-{
-	public:
-
-	// Enumeration of buffer pixel formats
-		enum Type
-		{
-			TYPE_UNKNOWN,
-			TYPE_R8G8B8,
-			TYPE_X8R8G8B8,
-			TYPE_R5G6B5,
-			TYPE_X1R5G5B5,
-			NUM_TYPES
-		};
-
-
-	protected:
-
-		UnsignedInt m_xPos;					///< X pixel buffer offset
-		UnsignedInt m_yPos;					///< Y pixel buffer offset
-		UnsignedInt m_width;				///< Buffer visible width
-		UnsignedInt m_height;				///< Buffer height
-		UnsignedInt m_textureWidth;	///< Buffer visible width
-		UnsignedInt m_textureHeight;///< Buffer height
-		UnsignedInt m_pitch;				///< buffer pitch
-
-		Type m_format;			///< buffer pixel format
-
-	public:
-
-		VideoBuffer( Type format );
-		virtual ~VideoBuffer() {};
-
-		virtual	Bool		allocate( UnsignedInt width, UnsignedInt Height ) = 0; ///< Allocate buffer
-		virtual void		free( void ) = 0;			///< Free the buffer
-		virtual	void*		lock( void ) = 0;			///< Returns memory pointer to start of buffer
-		virtual void		unlock( void ) = 0;		///< Release buffer
-		virtual Bool		valid( void ) = 0;		///< Is the buffer valid to use
-
-		UnsignedInt			xPos( void ) { return m_xPos;};///< X pixel offset to draw into
-		UnsignedInt			yPos( void ) { return m_yPos;};///< Y pixel offset to draw into
-		void		setPos( UnsignedInt x, UnsignedInt y ) { m_xPos = x; m_yPos = y;};	///< Set the x and y buffer offset
-		UnsignedInt			width( void ) { return m_width;};		///< Returns pixel width of visible texture
-		UnsignedInt			height( void ) { return m_height;};	///< Returns pixel height of visible texture
-		UnsignedInt			textureWidth( void ) { return m_textureWidth;};		///< Returns pixel width of texture
-		UnsignedInt			textureHeight( void ) { return m_textureHeight;};	///< Returns pixel height of texture
-		UnsignedInt			pitch( void ) { return m_pitch;};		///< Returns buffer pitch in bytes
-		Type		format( void ) { return m_format;};	///< Returns buffer pixel format
-
-		RectClass				Rect( Real x1, Real y1, Real x2, Real y2 );
-
-};
-
-
-//===============================
-// VideoStreamInterface
-//===============================
-/**
-  * Video stream interface class. 
-	*/
-//===============================
-
-class VideoStreamInterface
-{
-	friend class VideoPlayerInterface;
-
-	protected:
-
-		virtual ~VideoStreamInterface(){};								///< only VideoPlayerInterfaces can create these
-
-	public:
-
-
-		virtual	VideoStreamInterface* next( void ) = 0;		///< Returns next open stream
-		virtual void update( void ) = 0;									///< Update stream
-		virtual void close( void ) = 0;										///< Close and free stream
-																											
-		virtual Bool	isFrameReady( void ) = 0;						///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void ) = 0;				///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ) = 0; ///< Render current frame in to buffer
-		virtual void	frameNext( void ) = 0;							///< Advance to next frame
-		virtual Int		frameIndex( void ) = 0;							///< Returns zero based index of current frame
-		virtual Int		frameCount( void ) = 0;							///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index ) = 0;					///< Go to the spcified frame index
-		virtual Int		height( void ) = 0;									///< Return the height of the video
-		virtual Int		width( void ) = 0;									///< Return the width of the video
-
-};
-
-//===============================
-// VideoStream 
-//===============================
-
-
-
-class VideoStream : public VideoStreamInterface
-{
-	friend class VideoPlayer;
-
-	protected:
-
-		VideoPlayer							*m_player;								///< Video player we were created with
-		VideoStream							*m_next;									///< Next open stream
-																											
-		VideoStream();																		///< only VideoPlayer can create these
-		virtual ~VideoStream();
-
-	public:
-
- 		virtual	VideoStreamInterface* next( void );				///< Returns next open stream
-		virtual void update( void );											///< Update stream
-		virtual void close( void );												///< Close and free stream
-																											
-		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void );						///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
-		virtual void	frameNext( void );									///< Advance to next frame
-		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
-		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
-		virtual Int		height( void );											///< Return the height of the video
-		virtual Int		width( void );											///< Return the width of the video
-
-
-};
-
-//===============================
-// VideoPlayerInterface 
-//===============================
-/**
-  *	Interface for video playback.
-	*/
-//===============================
-
-class VideoPlayerInterface : public SubsystemInterface
-{
-
-	public:
-
-		virtual void	init( void ) = 0;														///< Initialize video playback
-		virtual void	reset( void ) = 0;													///< Reset video playback
-		virtual void	update( void ) = 0;													///< Services all video tasks. Should be called frequently
-																															
-		virtual void	deinit( void ) = 0;													///< Close down player
-																															
-		virtual				~VideoPlayerInterface() {};
-																															
-		// service																								
-		virtual void	loseFocus( void ) = 0;											///< Should be called when application loses focus
-		virtual void	regainFocus( void ) = 0;										///< Should be called when application regains focus
-
-		virtual VideoStreamInterface*	open( AsciiString movieTitle ) = 0;	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle ) = 0;	///< Load video file in to memory for playback
-
-		virtual VideoStreamInterface* firstStream( void ) = 0;		///< Return the first open/loaded video stream
-
-		virtual void	closeAllStreams( void ) = 0;								///< Close all open streams
-		virtual void	addVideo( Video* videoToAdd ) = 0;					///< Add a video to the list of videos we can play
-		virtual void	removeVideo( Video* videoToRemove ) = 0;		///< Remove a video to the list of videos we can play
-		virtual Int getNumVideos( void ) = 0;											///< Retrieve info about the number of videos currently listed
-		virtual const Video* getVideo( AsciiString movieTitle ) = 0;	///< Retrieve info about a movie based on internal name
-		virtual const Video* getVideo( Int index ) = 0;						///< Retrieve info about a movie based on index
-
-		virtual const FieldParse *getFieldParse( void ) const = 0;		///< Return the field parse info
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) = 0;		///< Notify the video player that they can now ask for an audio handle, or they need to give theirs up.
-};
-
-
-//===============================
-// VideoPlayer
-//===============================
-/**
-  *	Common video playback code.
-	*/
-//===============================
-
-class VideoPlayer : public VideoPlayerInterface
-{
-	protected:
-		VecVideo mVideosAvailableForPlay;
-		VideoStream		*m_firstStream;
-		static const FieldParse m_videoFieldParseTable[];
-
-	public:
-
-		// subsytem requirements
-		virtual void	init( void );														///< Initialize video playback code
-		virtual void	reset( void );													///< Reset video playback
-		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
-																													
-		virtual void	deinit( void );													///< Close down player
-																													
-																													
-		VideoPlayer();																				
-		~VideoPlayer();																				
-																													
-		// service																						
-		virtual void	loseFocus( void );											///< Should be called when application loses focus
-		virtual void	regainFocus( void );										///< Should be called when application regains focus
-																												
-		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
-		virtual VideoStreamInterface* firstStream( void );		///< Return the first open/loaded video stream
-		virtual void	closeAllStreams( void );								///< Close all open streams
-
-		virtual void	addVideo( Video* videoToAdd );					///< Add a video to the list of videos we can play
-		virtual void	removeVideo( Video* videoToRemove );		///< Remove a video to the list of videos we can play
-		virtual Int getNumVideos( void );											///< Retrieve info about the number of videos currently listed
-		virtual const Video* getVideo( AsciiString movieTitle );	///< Retrieve info about a movie based on internal name
-		virtual const Video* getVideo( Int index );						///< Retrieve info about a movie based on index
-		virtual const FieldParse *getFieldParse( void ) const { return m_videoFieldParseTable; }		///< Return the field parse info
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) { }
-
-		// Implementation specific
-		void remove( VideoStream *stream );										///< remove stream from active list
-		
-};
-
-extern VideoPlayerInterface *TheVideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-#endif // __GAMECLIENT_VIDEOPLAYER_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h b/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h
deleted file mode 100644
index 452ff1a9a3b..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: WindowVideoManager.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Mar 2002
-//
-//	Filename: 	WindowVideoManager.h
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WINDOWVIDEOMANAGER_H_
-#define __WINDOWVIDEOMANAGER_H_
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class GameWindow;
-class AsciiString;
-class VideoStreamInterface;
-class VideoBuffer;
-
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-
-enum WindowVideoPlayType CPP_11(: Int)
-{
-	WINDOW_PLAY_MOVIE_ONCE = 0,
-	WINDOW_PLAY_MOVIE_LOOP,
-	WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME,
-
-	WINDOW_PLAY_MOVIE_COUNT
-};
-
-enum WindowVideoStates CPP_11(: Int)
-{
-	WINDOW_VIDEO_STATE_START = 0,
-	WINDOW_VIDEO_STATE_STOP,
-	WINDOW_VIDEO_STATE_PAUSE,
-	WINDOW_VIDEO_STATE_PLAY,
-	WINDOW_VIDEO_STATE_HIDDEN,
-	
-	WINDOW_VIDEO_STATE_COUNT	
-};
-
-class WindowVideo
-{
-public:
-	WindowVideo( void );
-	~WindowVideo( void );
-	
-	VideoStreamInterface *getVideoStream( void );
-	VideoBuffer *getVideoBuffer( void );
-	GameWindow *getWin( void );
-	AsciiString getMovieName( void );
-	WindowVideoPlayType getPlayType ( void );
-	WindowVideoStates getState( void );
-
-	void setPlayType(WindowVideoPlayType playType);
-	void setWindowState( WindowVideoStates state );
-
-	void init( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType,VideoBuffer *videoBuffer, 
-	VideoStreamInterface *videoStream);
-	
-private:
-	WindowVideoPlayType m_playType;
-	GameWindow *m_win;
-	VideoBuffer *m_videoBuffer;
-	VideoStreamInterface *m_videoStream;
-	AsciiString m_movieName;
-	WindowVideoStates m_state;
-
-};
-
-
-class WindowVideoManager : public SubsystemInterface
-{
-public:
-	WindowVideoManager( void );
-	~WindowVideoManager( void );
-
-	// Inhertited from subsystem ====================================================================
-	virtual void init( void );			
-	virtual void reset( void );			
-	virtual void update( void );		
-	//===============================================================================================
-
-	
-	void playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType );
-	void hideMovie( GameWindow *win );							///< If the window becomes hidden while we're playing, stop the movie but test to see if we should resume
-	void pauseMovie( GameWindow *win );							///< Pause a movie and display it's current frame
-	void resumeMovie( GameWindow *win );						///< If a movie has been stopped, resume it.
-	void stopMovie( GameWindow *win );							///< Stop a movie
-	void stopAndRemoveMovie( GameWindow *win );			///< Stop a movie, and remove it from the manager
-	void stopAllMovies( void );											///< Stop all playing movies
-	void pauseAllMovies( void );										///< Pauses all movies on their current frame
-	void resumeAllMovies( void );										///< Resume Playing all movies
-	Int getWinState( GameWindow *win );			///< return the current state of the window.
-	
-private:
-
-	typedef const GameWindow* ConstGameWindowPtr;
-	// use special class for hashing, since std::hash won't compile for arbitrary ptrs
-	struct hashConstGameWindowPtr
-	{
-	size_t operator()(ConstGameWindowPtr p) const
-	{
-		std::hash<UnsignedInt> hasher;
-		return hasher((UnsignedInt)p);
-	}
-	};
-
-	typedef std::hash_map< ConstGameWindowPtr, WindowVideo *, hashConstGameWindowPtr, std::equal_to<ConstGameWindowPtr> > WindowVideoMap;
-
-	WindowVideoMap m_playingVideos;								///< List of currently playin Videos
-	//WindowVideoMap m_pausedVideos;									///< List of currently paused Videos
-	Bool m_stopAllMovies;														///< Maintains is we're in a stop all Movies State
-	Bool m_pauseAllMovies;													///< Maintains if we're in a pause all movies state
-
-
-};
-
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-inline VideoStreamInterface *WindowVideo::getVideoStream( void ){ return m_videoStream; };
-inline VideoBuffer *WindowVideo::getVideoBuffer( void ){ return m_videoBuffer; };
-inline GameWindow *WindowVideo::getWin( void ){ return m_win; };
-inline AsciiString WindowVideo::getMovieName( void ){ return m_movieName; };
-inline WindowVideoPlayType WindowVideo::getPlayType ( void ){ return m_playType; };
-inline WindowVideoStates WindowVideo::getState( void ){ return m_state; };
-
-inline void WindowVideo::setPlayType(WindowVideoPlayType playType){ m_playType = playType; };
-	
-
-
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-#endif // __WINDOWVIDEOMANAGER_H_
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIVideo.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIVideo.cpp
deleted file mode 100644
index 854c5ea7ed7..00000000000
--- a/Generals/Code/GameEngine/Source/Common/INI/INIVideo.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: INIVideo.cpp /////////////////////////////////////////////////////////////////////////////
-// Author: John McDonald, February 2002
-// Desc:   Parsing Video INI entries
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/INI.h"
-#include "GameClient/VideoPlayer.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-/** Parse Music entry */
-//-------------------------------------------------------------------------------------------------
-void INI::parseVideoDefinition( INI* ini )
-{
-	// read the name
-	const char* c = ini->getNextToken();
-
-	Video video;
-	video.m_internalName.set( c );
-
-	ini->initFromINI(&video, TheVideoPlayer->getFieldParse() );
-	TheVideoPlayer->addVideo(&video);
-
-
-}  // end parseVideoDefinition
-
-
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
deleted file mode 100644
index d285fd84f26..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: WindowVideoManager.cpp /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Apr 2002
-//
-//	Filename: 	WindowVideoManager.cpp
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	Every window is setup to be able to draw a movie.  The 
-//						WindowVideoManager will take care of setting up the window,
-//						creating/destroying the buffers, and the ability to pause/stop
-//						movies.
-//
-//	To Use:		Create a manager and initialize it. Make sure the manager's Update
-//						is called every frame or how ever often it needs to be updated.
-//						Call reset if the manager needs to be cleared.
-//						Play a movie in a window by passing a window pointer, a movie name,
-//						and the playtype.
-//						If a user trys to play a two different movies on the same window,
-//						only the last one added will play.
-//						It's important when destroying a window, that window is removed
-//						from the manager (Or call Reset if you know no other windows are
-//						playing a movie).
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/WindowVideoManager.h"
-#include "GameClient/GameWindow.h"
-#include "GameClient/VideoPlayer.h"
-#include "GameClient/Display.h"
-
-//-----------------------------------------------------------------------------
-// DEFINES ////////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// WindowVideo PUBLIC FUNCTIONS ///////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-WindowVideo::WindowVideo( void )
-{
-	
-	m_playType = WINDOW_PLAY_MOVIE_ONCE;
-	m_win = NULL;
-	m_videoBuffer = NULL;
-	m_videoStream = NULL;
-	m_movieName.clear();
-	m_state = WINDOW_VIDEO_STATE_STOP;
-
-}
-
-WindowVideo::~WindowVideo( void )
-{
-	// Don't Delete the window, only set it's video buffer to NULL
-	if(m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( NULL );
-	m_win = NULL;
-	
-	delete m_videoBuffer;
-	m_videoBuffer = NULL;
-
-	if ( m_videoStream )
-		m_videoStream->close();
-	m_videoStream = NULL;
-
-}
-	
-void WindowVideo::init( GameWindow *win, AsciiString movieName, 
-												WindowVideoPlayType playType,
-												VideoBuffer *videoBuffer, VideoStreamInterface *videoStream)
-{
-	m_win = win;
-	m_movieName = movieName;
-	m_playType = playType;
-	m_videoBuffer = videoBuffer;
-	m_videoStream = videoStream;
-	m_state = WINDOW_VIDEO_STATE_PLAY;
-	if(m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
-}
-	
-void WindowVideo::setWindowState( WindowVideoStates state )
-{ 
-	m_state = state; 
-
-	if(m_state == WINDOW_VIDEO_STATE_STOP && m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( NULL );
-
-	if((m_state == WINDOW_VIDEO_STATE_PLAY || m_state == WINDOW_VIDEO_STATE_PAUSE )&& m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
-}	
-
-//-----------------------------------------------------------------------------
-// WindowVideoManager PUBLIC FUNCTIONS ////////////////////////////////////////
-//-----------------------------------------------------------------------------
-WindowVideoManager::WindowVideoManager( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-
-}
-
-WindowVideoManager::~WindowVideoManager( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-}
-
-	
-void WindowVideoManager::init( void )
-{
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::reset( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::update( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-
-	if(m_pauseAllMovies || m_stopAllMovies)
-		return;
-
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		
-		if(!winVid)
-		{
-			DEBUG_CRASH(("There's No WindowVideo in the m_playignVideos list"));
-			return;
-		}
-		GameWindow *win = winVid->getWin();
-
-		if(winVid->getState() == WINDOW_VIDEO_STATE_HIDDEN && (win->winIsHidden() == FALSE))
-		{
-			resumeMovie(win);
-		}
-
-		if(winVid->getState() == WINDOW_VIDEO_STATE_PLAY && win->winIsHidden())
-		{
-			hideMovie(win);
-		}
-
-		// Only advance the frame if we're playing
-		if(winVid->getState() != WINDOW_VIDEO_STATE_PLAY)
-		{
-			it++;
-			continue;
-		}
-
-		// Get the Stream and the buffer to update for each animation
-		VideoStreamInterface *videoStream = winVid->getVideoStream();
-		VideoBuffer *videoBuffer = winVid->getVideoBuffer();
-		
-		if ( videoStream && videoBuffer )
-		{
-			if ( videoStream->isFrameReady())
-			{
-				videoStream->frameDecompress();
-				videoStream->frameRender( videoBuffer );
-				videoStream->frameNext();
-				
-				// If we reach frame Index of 0, we might have to pause, or loop.
-				if ( videoStream->frameIndex() == 0 )
-				{
-					if(winVid->getPlayType() == WINDOW_PLAY_MOVIE_ONCE)
-						stopMovie(win);
-					else if (winVid->getPlayType() == WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME)
-						pauseMovie(win);
-				}
-			}
-		}
-		
-		it++;
-	}
-}
-
-void WindowVideoManager::playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType )
-{
-	// if we already have a movie playing for that window, kill it.
-	stopAndRemoveMovie( win );
-	
-	// create the new stream
-	VideoStreamInterface *videoStream = TheVideoPlayer->open( movieName );
-	if ( videoStream == NULL )
-	{
-		return;
-	}
-
-	// Create the new buffer
-	VideoBuffer *videoBuffer = TheDisplay->createVideoBuffer();
-	if (	videoBuffer == NULL || 
-				!videoBuffer->allocate(	videoStream->width(), 
-													videoStream->height())
-		)
-	{
-		// If we failed to create the buffer...
-		delete videoBuffer;
-		videoBuffer = NULL;
-
-		if ( videoStream )
-			videoStream->close();
-		videoStream = NULL;
-
-		return;
-	}
-
-	// now that we have everything, create the new WindowVideo Structure
-	WindowVideo *winVid = NEW WindowVideo;
-	
-	// init it.
-	winVid->init( win, movieName,playType,videoBuffer,videoStream);
-
-	// add it to our map.
-	m_playingVideos[win] = winVid;
-
-	m_pauseAllMovies = FALSE;
-	m_stopAllMovies = FALSE;
-}
-
-
-void WindowVideoManager::pauseMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-		winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
-	}
-	
-}
-void WindowVideoManager::hideMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-		winVid->setWindowState(WINDOW_VIDEO_STATE_HIDDEN);
-	}
-}
-
-void WindowVideoManager::resumeMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
-	}
-	m_pauseAllMovies = FALSE;
-	m_stopAllMovies = FALSE;
-}
-
-void WindowVideoManager::stopMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
-	}
-}
-
-void WindowVideoManager::stopAndRemoveMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		winVid = NULL;
-		m_playingVideos.erase(it);
-	}
-}
-
-void WindowVideoManager::stopAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
-		it++;
-	}
-	
-	m_stopAllMovies = TRUE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::pauseAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
-		it++;
-	}
-	
-	m_pauseAllMovies = TRUE;
-	m_stopAllMovies = FALSE;
-}
-
-void WindowVideoManager::resumeAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
-		it++;
-	}
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-Int WindowVideoManager::getWinState( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			return winVid->getState();
-	}
-	return WINDOW_VIDEO_STATE_STOP;
-}
-
-//-----------------------------------------------------------------------------
-// PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/GameClient/VideoPlayer.cpp b/Generals/Code/GameEngine/Source/GameClient/VideoPlayer.cpp
deleted file mode 100644
index 9af5d03a030..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/VideoPlayer.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    GameClient
-//
-// File name: VideoPlayer.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Lib/BaseType.h"
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-VideoPlayerInterface *TheVideoPlayer = NULL;
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-//============================================================================
-// VideoBuffer::VideoBuffer
-//============================================================================
-
-VideoBuffer::VideoBuffer( Type format)
-: m_width(0),
-	m_height(0),
-	m_textureWidth(0),
-	m_textureHeight(0),
-	m_format(format),
-	m_pitch(0),
-	m_xPos(0),
-	m_yPos(0)
-{
-
-	if ( m_format >= NUM_TYPES || m_format < 0 )
-	{
-		m_format = TYPE_UNKNOWN;
-	}
-
-}
-
-//============================================================================
-// VideoBuffer::Rect
-//============================================================================
-
-RectClass VideoBuffer::Rect( Real x1, Real y1, Real x2, Real y2 )
-{
-	RectClass rect(0,0,0,0);
-
-	if ( valid() )
-	{
-		rect.Set( 
-						((Real)m_width/(Real)m_textureWidth)*x1, ((Real)m_height/(Real)m_textureHeight)*y1, 
-						((Real)m_width/(Real)m_textureWidth)*x2, ((Real)m_height/(Real)m_textureHeight)*y2
-					);
-	}
-
-	return rect;
-
-}
-
-//============================================================================
-// VideoBuffer::free
-//============================================================================
-
-void	VideoBuffer::free( void )
-{
-	m_width = 0;
-	m_height = 0;
-	m_textureWidth = 0;
-	m_textureHeight = 0;
-}
-
-//============================================================================
-// VideoPlayer::VideoPlayer
-//============================================================================
-
-VideoPlayer::VideoPlayer()
-: m_firstStream(NULL)
-{
-
-}
-
-//============================================================================
-// VideoPlayer::~VideoPlayer
-//============================================================================
-
-VideoPlayer::~VideoPlayer()
-{
-	deinit();
-	// Set the video player to null if its us. (WB requires this.)
-	if (this == TheVideoPlayer) {
-		TheVideoPlayer = NULL;
-	}
-}
-
-//============================================================================
-// VideoPlayer::init
-//============================================================================
-
-void	VideoPlayer::init( void )
-{
-	// Load this here so that WB doesn't have to link to BinkLib, costing us (potentially)
-	// an extra license.
-	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Default\\Video.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Video.ini" ), INI_LOAD_OVERWRITE, NULL );
-}
-
-//============================================================================
-// VideoPlayer::deinit
-//============================================================================
-
-void VideoPlayer::deinit( void )
-{
-}
-
-//============================================================================
-// VideoPlayer::reset
-//============================================================================
-
-void	VideoPlayer::reset( void )
-{
-	closeAllStreams();
-}
-
-//============================================================================
-// VideoPlayer::update
-//============================================================================
-
-void	VideoPlayer::update( void )
-{
-
-	VideoStreamInterface *stream = firstStream();
-
-	while ( stream )
-	{
-		stream->update();
-		stream = stream->next();
-	}
-
-}
-
-//============================================================================
-// VideoPlayer::loseFocus
-//============================================================================
-
-void	VideoPlayer::loseFocus( void )
-{
-
-}
-
-//============================================================================
-// VideoPlayer::regainFocus
-//============================================================================
-
-void	VideoPlayer::regainFocus( void )
-{
-
-}
-
-//============================================================================
-// VideoPlayer::open
-//============================================================================
-
-VideoStreamInterface*	VideoPlayer::open( AsciiString movieTitle )
-{
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::load
-//============================================================================
-
-VideoStreamInterface*	VideoPlayer::load( AsciiString movieTitle )
-{
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::firstStream
-//============================================================================
-
-VideoStreamInterface* VideoPlayer::firstStream( void )
-{
-	return m_firstStream;
-}
-
-//============================================================================
-// VideoPlayer::closeAllStreams
-//============================================================================
-
-void	VideoPlayer::closeAllStreams( void )
-{
-	VideoStreamInterface *stream ;
-
-	while ( (stream = firstStream()) != 0 )
-	{
-		stream->close();
-	}
-}
-
-//============================================================================
-// VideoPlayer::remove
-//============================================================================
-
-void VideoPlayer::remove( VideoStream *stream_to_remove )
-{
-	VideoStream *last = NULL;
-	VideoStream *stream = (VideoStream*) firstStream();
-
-	while ( stream != NULL && stream != stream_to_remove )
-	{
-		last = stream;
-		stream = (VideoStream*) stream->next();
-	}
-
-	if ( stream )
-	{
-		if ( last )
-		{
-			last->m_next = stream->m_next;
-		}
-		else
-		{
-			m_firstStream = stream->m_next;
-		}
-	}
-}
-
-//============================================================================
-// VideoPlayer::addVideo
-//============================================================================
-void VideoPlayer::addVideo( Video* videoToAdd )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == videoToAdd->m_internalName) {
-			(*it) = (*videoToAdd);
-			return;
-		}
-	}
-
-	// That internal name hasn't been used, so push a new entry on the back
-	mVideosAvailableForPlay.push_back(*videoToAdd);
-}
-
-//============================================================================
-// VideoPlayer::removeVideo
-//============================================================================
-void VideoPlayer::removeVideo( Video* videoToRemove )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == videoToRemove->m_internalName) {
-			mVideosAvailableForPlay.erase(it);
-			return;
-		}
-	}
-}
-
-//============================================================================
-// VideoPlayer::getNumVideos
-//============================================================================
-Int VideoPlayer::getNumVideos( void )
-{
-	return mVideosAvailableForPlay.size();
-}
-
-//============================================================================
-// VideoPlayer::removeVideo
-//============================================================================
-const Video* VideoPlayer::getVideo( AsciiString movieTitle )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == movieTitle) {
-			return &(*it);
-		}
-	}
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::getVideo
-//============================================================================
-const Video* VideoPlayer::getVideo( Int index )
-{
-	if (index < 0 || index >= mVideosAvailableForPlay.size()) {
-		return NULL;
-	}
-
-	return &mVideosAvailableForPlay[index];
-}
-
-//============================================================================
-// VideoStream::VideoStream
-//============================================================================
-
-VideoStream::VideoStream()
-: m_next(NULL),
-	m_player(NULL)
-{
-
-}
-
-//============================================================================
-// VideoStream::~VideoStream
-//============================================================================
-
-VideoStream::~VideoStream()
-{
-
-	if ( m_player )
-	{
-		m_player->remove( this );
-		m_player = NULL;
-	}
-
-}
-
-//============================================================================
-// VideoStream::next
-//============================================================================
-
-VideoStreamInterface* VideoStream::next( void )
-{
-	return m_next;
-}
-
-//============================================================================
-// VideoStream::update
-//============================================================================
-
-void VideoStream::update( void )
-{
-}
-
-//============================================================================
-// VideoStream::close
-//============================================================================
-
-void VideoStream::close( void )
-{
-	delete this;
-}
-
-//============================================================================
-// VideoStream::isFrameReady
-//============================================================================
-
-Bool VideoStream::isFrameReady( void )
-{
-	return TRUE;
-}
-
-//============================================================================
-// VideoStream::frameDecompress
-//============================================================================
-
-void VideoStream::frameDecompress( void )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameRender
-//============================================================================
-
-void VideoStream::frameRender( VideoBuffer *buffer )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameNext
-//============================================================================
-
-void VideoStream::frameNext( void )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameIndex
-//============================================================================
-
-Int VideoStream::frameIndex( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::totalFrames
-//============================================================================
-
-Int	VideoStream::frameCount( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::frameGoto
-//============================================================================
-
-void VideoStream::frameGoto( Int index )
-{
-
-}
-
-//============================================================================
-// VideoStream::height
-//============================================================================
-
-Int		VideoStream::height( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::width
-//============================================================================
-
-Int		VideoStream::width( void )
-{
-	return 0;
-}
-
-
-const FieldParse VideoPlayer::m_videoFieldParseTable[] = 
-{
-	{ "Filename",								INI::parseAsciiString,							NULL, offsetof( Video, m_filename) },
-	{ "Comment",								INI::parseAsciiString,							NULL, offsetof( Video, m_commentForWB) },
-	{ NULL,											NULL,																NULL, 0 },
-};
-
diff --git a/Generals/Code/GameEngine/Source/GameClient/VideoStream.cpp b/Generals/Code/GameEngine/Source/GameClient/VideoStream.cpp
deleted file mode 100644
index 3058a42fbdf..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/VideoStream.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    GameClient
-//
-// File name: VideoStream.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
index bf2aef874bd..9ea92fdd6e3 100644
--- a/Generals/Code/GameEngineDevice/CMakeLists.txt
+++ b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(GAMEENGINEDEVICE_SRC
 #    Include/MilesAudioDevice/MilesAudioManager.h
-    Include/VideoDevice/Bink/BinkVideoPlayer.h
+#    Include/VideoDevice/Bink/BinkVideoPlayer.h
     Include/W3DDevice/Common/W3DConvert.h
     Include/W3DDevice/Common/W3DFunctionLexicon.h
     Include/W3DDevice/Common/W3DModuleFactory.h
@@ -59,7 +59,7 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameClient/W3DTerrainTracks.h
     Include/W3DDevice/GameClient/W3DTerrainVisual.h
     Include/W3DDevice/GameClient/W3DTreeBuffer.h
-    Include/W3DDevice/GameClient/W3DVideobuffer.h
+#    Include/W3DDevice/GameClient/W3DVideoBuffer.h
     Include/W3DDevice/GameClient/W3DView.h
     Include/W3DDevice/GameClient/W3DVolumetricShadow.h
     Include/W3DDevice/GameClient/W3DWater.h
@@ -79,7 +79,7 @@ set(GAMEENGINEDEVICE_SRC
     Include/Win32Device/GameClient/Win32DIKeyboard.h
     Include/Win32Device/GameClient/Win32Mouse.h
 #    Source/MilesAudioDevice/MilesAudioManager.cpp
-    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+#    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
     Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
     Source/W3DDevice/Common/System/W3DRadar.cpp
     Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
@@ -157,7 +157,7 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
     Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
     Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
-    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
     Source/W3DDevice/GameClient/W3DView.cpp
     Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
     Source/W3DDevice/GameClient/W3DWebBrowser.cpp
diff --git a/Generals/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/Generals/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
deleted file mode 100644
index 497795fb860..00000000000
--- a/Generals/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  GameClient/VideoPlayer.h
-//
-// Created:    10/22/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __VIDEODEVICE_BINKDEVICE_H_
-#define __VIDEODEVICE_BINKDEVICE_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "GameClient/VideoPlayer.h"
-#include "bink.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class BinkVideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// BinkVideoStream
-//===============================
-
-class BinkVideoStream : public VideoStream
-{
-	friend class BinkVideoPlayer;
-
-	protected:
-
-		HBINK					m_handle;														///< Bink streaming handle;
-		Char					*m_memFile;													///< Pointer to memory resident file
-																											
-		BinkVideoStream();																///< only BinkVideoPlayer can create these
-		virtual ~BinkVideoStream();												
-																											
-	public:																							
-																											
-		virtual void update( void );											///< Update bink stream
-
-		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void );						///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
-		virtual void	frameNext( void );									///< Advance to next frame
-		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
-		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
-		virtual Int		height( void );											///< Return the height of the video
-		virtual Int		width( void );											///< Return the width of the video
-
-
-};
-
-//===============================
-// BinkVideoPlayer
-//===============================
-/**
-  *	Bink video playback code.
-	*/
-//===============================
-
-class BinkVideoPlayer : public VideoPlayer
-{
-
-	protected:
-
-		VideoStreamInterface* createStream( HBINK handle );
-
-	public:
-
-		// subsytem requirements
-		virtual void	init( void );														///< Initialize video playback code
-		virtual void	reset( void );													///< Reset video playback
-		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
-																													
-		virtual void	deinit( void );													///< Close down player
-																														
-																													
-		BinkVideoPlayer();																				
-		~BinkVideoPlayer();																				
-																													
-		// service																						
-		virtual void	loseFocus( void );											///< Should be called when application loses focus
-		virtual void	regainFocus( void );										///< Should be called when application regains focus
-																												
-		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid );
-		virtual void initializeBinkWithMiles( void );
-};
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __VIDEODEVICE_BINKDEVICE_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h
deleted file mode 100644
index b99095ab841..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  W3DDevice/GameClient/W3DVideoBuffer.h
-//
-// Created:    10/23/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
-#define __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class TextureClass;
-class SurfaceClass;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// W3DVideoBuffer
-//===============================
-/**
-  * Video buffer interface class to a W3D TextureClass
-	*/
-//===============================
-
-
-class W3DVideoBuffer : public VideoBuffer
-{
-	protected:
-
-		TextureClass	*m_texture;
-		SurfaceClass	*m_surface;
-
-	public:
-
-		W3DVideoBuffer( Type format );
-		virtual ~W3DVideoBuffer();
-
-		virtual	Bool		allocate( UnsignedInt width, UnsignedInt height); ///< Allocates buffer
-		virtual void		free( void);					///< Free buffer
-		virtual	void*		lock( void );					///< Returns memory pointer to start of buffer
-		virtual void		unlock( void );				///< Release buffer
-		virtual Bool		valid( void );				///< Is the buffer valid to use
-
-		TextureClass		*texture( void );			///< Returns texture object
-
-		static WW3DFormat TypeToW3DFormat( VideoBuffer::Type format );
-		static VideoBuffer::Type W3DFormatToType( WW3DFormat w3dFormat );
-};
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-inline TextureClass* W3DVideoBuffer::texture( void ) { return m_texture; }
-
-#endif // __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
diff --git a/Generals/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp b/Generals/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
deleted file mode 100644
index 291ea180044..00000000000
--- a/Generals/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    VideoDevice
-//
-// File name: BinkDevice.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "VideoDevice/Bink/BinkVideoPlayer.h"
-#include "Common/AudioAffect.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/GlobalData.h"
-#include "Common/Registry.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
- 
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-#define VIDEO_LANG_PATH_FORMAT "Data/%s/Movies/%s.%s"
-#define VIDEO_PATH	"Data\\Movies"
-#define VIDEO_EXT		"bik"
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// BinkVideoPlayer::BinkVideoPlayer
-//============================================================================
-
-BinkVideoPlayer::BinkVideoPlayer()
-{
-
-}
-
-//============================================================================
-// BinkVideoPlayer::~BinkVideoPlayer
-//============================================================================
-
-BinkVideoPlayer::~BinkVideoPlayer()
-{
-	deinit();
-}
-
-//============================================================================
-// BinkVideoPlayer::init
-//============================================================================
-
-void	BinkVideoPlayer::init( void )
-{
-	// Need to load the stuff from the ini file.
-	VideoPlayer::init();
-
-	initializeBinkWithMiles();
-}
-
-//============================================================================
-// BinkVideoPlayer::deinit
-//============================================================================
-
-void BinkVideoPlayer::deinit( void )
-{
-	TheAudio->releaseHandleForBink();
-	VideoPlayer::deinit();
-}
-
-//============================================================================
-// BinkVideoPlayer::reset
-//============================================================================
-
-void	BinkVideoPlayer::reset( void )
-{
-	VideoPlayer::reset();
-}
-
-//============================================================================
-// BinkVideoPlayer::update
-//============================================================================
-
-void	BinkVideoPlayer::update( void )
-{
-	VideoPlayer::update();
-
-}
-
-//============================================================================
-// BinkVideoPlayer::loseFocus
-//============================================================================
-
-void	BinkVideoPlayer::loseFocus( void )
-{
-	VideoPlayer::loseFocus();
-}
-
-//============================================================================
-// BinkVideoPlayer::regainFocus
-//============================================================================
-
-void	BinkVideoPlayer::regainFocus( void )
-{
-	VideoPlayer::regainFocus();
-}
-
-//============================================================================
-// BinkVideoPlayer::createStream
-//============================================================================
-
-VideoStreamInterface* BinkVideoPlayer::createStream( HBINK handle )
-{
-
-	if ( handle == NULL )
-	{
-		return NULL;
-	}
-
-	BinkVideoStream *stream = NEW BinkVideoStream;
-
-	if ( stream )
-	{
-
-		stream->m_handle = handle;
-		stream->m_next = m_firstStream;
-		stream->m_player = this;
-		m_firstStream = stream;
-
-		// never let volume go to 0, as Bink will interpret that as "play at full volume".
-		Int mod = (Int) ((TheAudio->getVolume(AudioAffect_Speech) * 0.8f) * 100) + 1;
-		Int volume = (32768*mod)/100;
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to set volume (%g -> %d -> %d",
-			TheAudio->getVolume(AudioAffect_Speech), mod, volume));
-		BinkSetVolume( stream->m_handle,0, volume);
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - set volume"));
-	}
-
-	return stream;
-}
-
-//============================================================================
-// BinkVideoPlayer::open
-//============================================================================
-
-VideoStreamInterface*	BinkVideoPlayer::open( AsciiString movieTitle )
-{
-	VideoStreamInterface*	stream = NULL;
-
-	const Video* pVideo = getVideo(movieTitle);
-	if (pVideo) {
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to open bink file"));
-
-		if (TheGlobalData->m_modDir.isNotEmpty())
-		{
-			char filePath[ _MAX_PATH ];
-			sprintf( filePath, "%s%s\\%s.%s", TheGlobalData->m_modDir.str(), VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
-			HBINK handle = BinkOpen(filePath , BINKPRELOADALL );
-			DEBUG_ASSERTLOG(!handle, ("opened bink file %s", filePath));
-			if (handle)
-			{
-				return createStream( handle );
-			}
-		}
-
-		char localizedFilePath[ _MAX_PATH ];
-		sprintf( localizedFilePath, VIDEO_LANG_PATH_FORMAT, GetRegistryLanguage().str(), pVideo->m_filename.str(), VIDEO_EXT );
-		HBINK handle = BinkOpen(localizedFilePath , BINKPRELOADALL );
-		DEBUG_ASSERTLOG(!handle, ("opened localized bink file %s", localizedFilePath));
-		if (!handle)
-		{
-			char filePath[ _MAX_PATH ];
-			sprintf( filePath, "%s\\%s.%s", VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
-			handle = BinkOpen(filePath , BINKPRELOADALL );
-			DEBUG_ASSERTLOG(!handle, ("opened bink file %s", localizedFilePath));
-		}
-
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to create stream"));
-		stream = createStream( handle );
-	}
-
-	return stream;	
-}
-
-//============================================================================
-// BinkVideoPlayer::load
-//============================================================================
-
-VideoStreamInterface*	BinkVideoPlayer::load( AsciiString movieTitle )
-{
-	return open(movieTitle); // load() used to have the same body as open(), so I'm combining them.  Munkee.
-}
-
-//============================================================================
-//============================================================================
-void BinkVideoPlayer::notifyVideoPlayerOfNewProvider( Bool nowHasValid )
-{
-	if (!nowHasValid) {
-		TheAudio->releaseHandleForBink();
-		BinkSetSoundTrack(0, 0);
-	} else {
-		initializeBinkWithMiles();
-	}
-}
-
-//============================================================================
-//============================================================================
-void BinkVideoPlayer::initializeBinkWithMiles()
-{
-	Int retVal = 0;
-	void *driver = TheAudio->getHandleForBink();	
-	
-	if ( driver )
-	{
-		retVal = BinkSoundUseDirectSound(driver);
-	}
-	if( !driver || retVal == 0)
-	{
-		BinkSetSoundTrack ( 0,0 );
-	}
-}
-
-//============================================================================
-// BinkVideoStream::BinkVideoStream
-//============================================================================
-
-BinkVideoStream::BinkVideoStream()
-: m_handle(NULL)
-{
-
-}
-
-//============================================================================
-// BinkVideoStream::~BinkVideoStream
-//============================================================================
-
-BinkVideoStream::~BinkVideoStream()
-{
-	if ( m_handle != NULL )
-	{
-		BinkClose( m_handle );
-		m_handle = NULL;
-	}
-}
-
-//============================================================================
-// BinkVideoStream::update
-//============================================================================
-
-void BinkVideoStream::update( void )
-{
-	BinkWait( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::isFrameReady
-//============================================================================
-
-Bool BinkVideoStream::isFrameReady( void )
-{
-	return !BinkWait( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameDecompress
-//============================================================================
-
-void BinkVideoStream::frameDecompress( void )
-{
-		BinkDoFrame( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameRender
-//============================================================================
-
-void BinkVideoStream::frameRender( VideoBuffer *buffer )
-{
-	if ( buffer )
-	{
-		void *mem = buffer->lock();
-
-		u32 flags;
-
-		switch ( buffer->format())
-		{
-			case VideoBuffer::TYPE_X8R8G8B8:
-				flags = BINKSURFACE32;
-				break;
-
-			case VideoBuffer::TYPE_R8G8B8:
-				flags = BINKSURFACE24;
-				break;
-
-			case VideoBuffer::TYPE_R5G6B5:
-				flags = BINKSURFACE565;
-				break;
-
-			case VideoBuffer::TYPE_X1R5G5B5:
-				flags = BINKSURFACE555;
-				break;
-
-			default:
-				return;
-		}
-		
-		if ( mem != NULL )
-		{
-
-			BinkCopyToBuffer ( m_handle, mem, buffer->pitch(), buffer->height(),
-													buffer->xPos(), buffer->yPos(), flags );
-			buffer->unlock();
-		}
-	}
-
-}
-
-//============================================================================
-// BinkVideoStream::frameNext
-//============================================================================
-
-void BinkVideoStream::frameNext( void )
-{
-	BinkNextFrame( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameIndex
-//============================================================================
-
-Int BinkVideoStream::frameIndex( void )
-{
-	return m_handle->FrameNum - 1;
-}
-
-//============================================================================
-// BinkVideoStream::totalFrames
-//============================================================================
-
-Int	BinkVideoStream::frameCount( void )
-{
-	return m_handle->Frames;
-}
-
-//============================================================================
-// BinkVideoStream::frameGoto
-//============================================================================
-
-void BinkVideoStream::frameGoto( Int index )
-{
-	BinkGoto(m_handle, index, NULL );
-}
-
-//============================================================================
-// VideoStream::height
-//============================================================================
-
-Int		BinkVideoStream::height( void )
-{
-	return m_handle->Height;
-}
-
-//============================================================================
-// VideoStream::width
-//============================================================================
-
-Int		BinkVideoStream::width( void )
-{
-	return m_handle->Width;
-}
-
-
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
index a03ed940b88..cf477abe061 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -74,7 +74,7 @@ static void drawFramerateBar(void);
 #include "W3DDevice/GameClient/W3DScene.h"
 #include "W3DDevice/GameClient/W3DTerrainTracks.h"
 #include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
+#include "W3DDevice/GameClient/W3DVideoBuffer.h"
 #include "W3DDevice/GameClient/W3DShaderManager.h"
 #include "W3DDevice/GameClient/W3DDebugDisplay.h"
 #include "W3DDevice/GameClient/W3DProjectedShadow.h"
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
index be441cbf743..b70abf8fe0e 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
@@ -128,8 +128,9 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
 		dstTextureWidth=m_numMaxVisibleCellsX=REAL_TO_INT_FLOOR((Real)(pMap->getDrawWidth()-1)*MAP_XY_FACTOR/m_cellWidth)+1;
 		dstTextureHeight=m_numMaxVisibleCellsY=REAL_TO_INT_FLOOR((Real)(pMap->getDrawHeight()-1)*MAP_XY_FACTOR/m_cellHeight)+1;
 		dstTextureWidth += 2;	//enlarge by 2 pixels so we can have a border color all the way around.
+		unsigned int depth = 1;
 		dstTextureHeight += 2;	//enlarge by 2 pixels so we can have border color all the way around.
-		TextureLoader::Validate_Texture_Size((unsigned int &)dstTextureWidth,(unsigned int &)dstTextureHeight);
+		TextureLoader::Validate_Texture_Size((unsigned int &)dstTextureWidth,(unsigned int &)dstTextureHeight, depth);
 	}
 
 	UnsignedInt srcWidth,srcHeight;
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
deleted file mode 100644
index 4f7701d094c..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    Video
-//
-// File name: W3DDevice/GameClient/W3DVideoBuffer.cpp
-//
-// Created:   10/23/01 TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/GameMemory.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/textureloader.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// W3DVideoBuffer::W3DVideoBuffer
-//============================================================================
-
-W3DVideoBuffer::W3DVideoBuffer( VideoBuffer::Type format )
-: VideoBuffer(format),
-	m_texture(NULL),
-	m_surface(NULL)
-{
-
-}
-
-
-//============================================================================
-// W3DVideoBuffer::SetBuffer
-//============================================================================
-
-Bool W3DVideoBuffer::allocate( UnsignedInt width, UnsignedInt height )
-{
-	free();
-
-	m_width = width;
-	m_height = height;
-	m_textureWidth = width;;
-	m_textureHeight = height;;
-	TextureLoader::Validate_Texture_Size( m_textureWidth, m_textureHeight);
-
-	WW3DFormat w3dFormat = TypeToW3DFormat(  m_format );
- 
-	if ( w3dFormat == WW3D_FORMAT_UNKNOWN )
-	{
-		return NULL;	
-	}
-
-	m_texture  = MSGNEW("TextureClass") TextureClass ( m_textureWidth, m_textureHeight, w3dFormat, MIP_LEVELS_1 );
-
-	if ( m_texture == NULL )
-	{
-		return FALSE;
-	}
-
-	if ( lock() == NULL )
-	{
-		free();
-		return FALSE;
-	}
-
-	unlock();
-
-
-	return TRUE;
-}
-
-//============================================================================
-// W3DVideoBuffer::~W3DVideoBuffer
-//============================================================================
-
-W3DVideoBuffer::~W3DVideoBuffer()
-{
-	free();
-}
-
-//============================================================================
-// W3DVideoBuffer::lock
-//============================================================================
-
-void*		W3DVideoBuffer::lock( void )
-{
-	void *mem = NULL;
-
-	if ( m_surface != NULL )
-	{
-		unlock();
-	}
-
-	m_surface = m_texture->Get_Surface_Level();		
-
-	if ( m_surface )
-	{
-		mem = m_surface->Lock( (Int*) &m_pitch );
-	}
-
-	return mem;
-}
-
-//============================================================================
-// W3DVideoBuffer::unlock
-//============================================================================
-
-void		W3DVideoBuffer::unlock( void )
-{
-	if ( m_surface != NULL )
-	{
-		m_surface->Unlock();
-		m_surface->Release_Ref();
-		m_surface = NULL;
-	}
-}
-
-//============================================================================
-// W3DVideoBuffer::valid
-//============================================================================
-
-Bool		W3DVideoBuffer::valid( void )
-{
-	return m_texture != NULL;
-}
-
-//============================================================================
-// W3DVideoBuffer::reset
-//============================================================================
-
-void	W3DVideoBuffer::free( void )
-{
-	unlock();
-
-	if ( m_texture )
-	{
-		unlock();
-		m_texture->Release_Ref();
-		m_texture = NULL;
-	}
-	m_surface = NULL;
-
-	VideoBuffer::free();
-}
-
-
-//============================================================================
-// W3DVideoBuffer::TypeToW3DFormat
-//============================================================================
-
-WW3DFormat W3DVideoBuffer::TypeToW3DFormat( VideoBuffer::Type format )
-{
-	WW3DFormat w3dFormat = WW3D_FORMAT_UNKNOWN;
-	switch ( format )
-	{
-		case TYPE_X8R8G8B8:
-			w3dFormat = WW3D_FORMAT_X8R8G8B8;
-			break;
-
- 		case TYPE_R8G8B8:
-			w3dFormat = WW3D_FORMAT_R8G8B8;
-			break;
-
- 		case TYPE_R5G6B5:
-			w3dFormat = WW3D_FORMAT_R5G6B5;
-			break;
-
- 		case TYPE_X1R5G5B5:
-			w3dFormat = WW3D_FORMAT_X1R5G5B5;
-			break;
-	}
-
-	return w3dFormat;
-}
-
-//============================================================================
-// W3DFormatToType
-//============================================================================
-
-VideoBuffer::Type W3DVideoBuffer::W3DFormatToType( WW3DFormat w3dFormat )
-{
-	Type format = TYPE_UNKNOWN;
-	switch ( w3dFormat )
-	{
-		case WW3D_FORMAT_X8R8G8B8:
-				format = VideoBuffer::TYPE_X8R8G8B8;
-				break;
-		case WW3D_FORMAT_R8G8B8:
-				format = VideoBuffer::TYPE_R8G8B8;
-				break;
-		case WW3D_FORMAT_R5G6B5:
-				format = VideoBuffer::TYPE_R5G6B5;
-				break;
-		case WW3D_FORMAT_X1R5G5B5:
-				format = VideoBuffer::TYPE_X1R5G5B5;
-				break;
-	}
-
-	return format;
-}
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
index 341d8e4c450..c9554b12769 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
@@ -125,51 +125,66 @@ void TextureLoader::Deinit()
 //
 // ----------------------------------------------------------------------------
 
-void TextureLoader::Validate_Texture_Size(unsigned& width, unsigned& height)
+void TextureLoader::Validate_Texture_Size
+(
+	unsigned& width, 
+	unsigned& height,
+	unsigned& depth
+)
 {
 	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
 
 	unsigned poweroftwowidth = 1;
-	while (poweroftwowidth < width) {
+	while (poweroftwowidth < width) 
+	{
 		poweroftwowidth <<= 1;
 	}
 
 	unsigned poweroftwoheight = 1;
-	while (poweroftwoheight < height) {
+	while (poweroftwoheight < height) 
+	{
 		poweroftwoheight <<= 1;
 	}
 
-//	unsigned size = MAX (width, height);
-//	unsigned poweroftwosize = 1;
-//	while (poweroftwosize < size) {
-//		poweroftwosize <<= 1;
-//	}
+	unsigned poweroftwodepth = 1;
+	while (poweroftwodepth< depth)
+	{
+		poweroftwodepth <<= 1;
+	}
 
-	if (poweroftwowidth>dx8caps.MaxTextureWidth) {
+	if (poweroftwowidth>dx8caps.MaxTextureWidth) 
+	{
 		poweroftwowidth=dx8caps.MaxTextureWidth;
 	}
-	if (poweroftwoheight>dx8caps.MaxTextureHeight) {
+	if (poweroftwoheight>dx8caps.MaxTextureHeight) 
+	{
 		poweroftwoheight=dx8caps.MaxTextureHeight;
 	}
+	if (poweroftwodepth>dx8caps.MaxVolumeExtent)
+	{
+		poweroftwodepth=dx8caps.MaxVolumeExtent;
+	}
 
-	if (poweroftwowidth>poweroftwoheight) {
-		while (poweroftwowidth/poweroftwoheight>8) {
+	if (poweroftwowidth>poweroftwoheight) 
+	{
+		while (poweroftwowidth/poweroftwoheight>8) 
+		{
 			poweroftwoheight*=2;
 		}
 	}
-	else {
-		while (poweroftwoheight/poweroftwowidth>8) {
+	else 
+	{
+		while (poweroftwoheight/poweroftwowidth>8) 
+		{
 			poweroftwowidth*=2;
 		}
 	}
 
-//	width = height = poweroftwosize;
 	width=poweroftwowidth;
 	height=poweroftwoheight;
+	depth=poweroftwodepth;
 }
 
-
-
 IDirect3DTexture8* TextureLoader::Load_Thumbnail(const StringClass& filename,WW3DFormat texture_format)
 {
 	ThumbnailClass* thumb=ThumbnailClass::Peek_Instance(filename);
@@ -1031,10 +1046,10 @@ void TextureLoadTaskClass::Begin_Texture_Load()
 			DDSFileClass dds_file(Texture->Get_Full_Path(),Get_Reduction());
 			if (dds_file.Is_Available()) {
 				// Destination size will be the next power of two square from the larger width and height...
-				unsigned width, height;
+				unsigned width, height, depth;
 				width=dds_file.Get_Width(0);
 				height=dds_file.Get_Height(0);
-				TextureLoader::Validate_Texture_Size(width,height);
+				TextureLoader::Validate_Texture_Size(width,height,depth);
 
 				// If the size doesn't match, try and see if texture reduction would help... (mainly for
 				// cases where loaded texture is larger than hardware limit)
@@ -1042,7 +1057,7 @@ void TextureLoadTaskClass::Begin_Texture_Load()
 					for (unsigned i=1;i<dds_file.Get_Mip_Level_Count();++i) {
 						unsigned w=dds_file.Get_Width(i);
 						unsigned h=dds_file.Get_Height(i);
-						TextureLoader::Validate_Texture_Size(width,height);
+						TextureLoader::Validate_Texture_Size(width,height,depth);
 						if (w==dds_file.Get_Width(i) || h==dds_file.Get_Height(i)) {
 							Reduction+=i;
 							width=w;
@@ -1105,7 +1120,7 @@ void TextureLoadTaskClass::Begin_Texture_Load()
 			}
 
 			// Destination size will be the next power of two square from the larger width and height...
-			unsigned width=targa.Header.Width, height=targa.Header.Height;
+			unsigned width=targa.Header.Width, height=targa.Header.Height, depth;
 			int ReductionFactor=Get_Reduction();
 			int MipLevels=0;
 
@@ -1126,7 +1141,7 @@ void TextureLoadTaskClass::Begin_Texture_Load()
 			height=targa.Header.Height>>ReductionFactor;
 			unsigned ow=width;
 			unsigned oh=height;
-			TextureLoader::Validate_Texture_Size(width,height);
+			TextureLoader::Validate_Texture_Size(width,height,depth);
 			if (width!=ow || height!=oh) {
 				WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d",Texture->Get_Full_Path().str(),ow,oh,width,height));
 			}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h
index 7fd9091edb1..5f02b36bfdd 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h
@@ -41,7 +41,7 @@ class TextureLoader
 	static void Deinit();
 
 	// Modify given texture size to nearest valid size on current hardware.
-	static void Validate_Texture_Size(unsigned& width, unsigned& height);
+	static void Validate_Texture_Size(unsigned& width, unsigned& height, unsigned& depth);
 
 	// Adds a loading task to the system. The task if processed in a separate
 	// thread as soon as possible. The task will appear in finished tasks list
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
index 4a9ebd2f2a0..c617becde4b 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
@@ -92,7 +92,8 @@ ThumbnailClass::ThumbnailClass(const StringClass& filename)
 		// Destination size will be the next power of two square from the larger width and height...
 		Width=targa.Header.Width>>reduction_factor;
 		Height=targa.Header.Height>>reduction_factor;
-		TextureLoader::Validate_Texture_Size(Width,Height);
+		unsigned depth;
+		TextureLoader::Validate_Texture_Size(Width,Height,depth);
 		unsigned src_width=targa.Header.Width;
 		unsigned src_height=targa.Header.Height;
 
diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt
index 7653a203a6c..d947c86b0ad 100644
--- a/GeneralsMD/Code/GameEngine/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngine/CMakeLists.txt
@@ -223,11 +223,11 @@ set(GAMEENGINE_SRC
     Include/GameClient/Statistics.h
     Include/GameClient/TerrainRoads.h
     Include/GameClient/TerrainVisual.h
-    Include/GameClient/VideoPlayer.h
+#    Include/GameClient/VideoPlayer.h
     Include/GameClient/View.h
     Include/GameClient/Water.h
     Include/GameClient/WindowLayout.h
-    Include/GameClient/WindowVideoManager.h
+#    Include/GameClient/WindowVideoManager.h
     Include/GameClient/WindowXlat.h
     Include/GameClient/WinInstanceData.h
     Include/GameLogic/AI.h
@@ -596,7 +596,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INITerrainBridge.cpp
     Source/Common/INI/INITerrainRoad.cpp
     Source/Common/INI/INIUpgrade.cpp
-    Source/Common/INI/INIVideo.cpp
+#    Source/Common/INI/INIVideo.cpp
     Source/Common/INI/INIWater.cpp
     Source/Common/INI/INIWeapon.cpp
     Source/Common/INI/INIWebpageURL.cpp
@@ -790,7 +790,7 @@ set(GAMEENGINE_SRC
     Source/GameClient/GUI/Shell/Shell.cpp
     Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
     Source/GameClient/GUI/WindowLayout.cpp
-    Source/GameClient/GUI/WindowVideoManager.cpp
+#    Source/GameClient/GUI/WindowVideoManager.cpp
     Source/GameClient/GUI/WinInstanceData.cpp
     Source/GameClient/InGameUI.cpp
     Source/GameClient/Input/Keyboard.cpp
@@ -822,8 +822,8 @@ set(GAMEENGINE_SRC
     Source/GameClient/System/Smudge.cpp
     Source/GameClient/Terrain/TerrainRoads.cpp
     Source/GameClient/Terrain/TerrainVisual.cpp
-    Source/GameClient/VideoPlayer.cpp
-    Source/GameClient/VideoStream.cpp
+#    Source/GameClient/VideoPlayer.cpp
+#    Source/GameClient/VideoStream.cpp
     Source/GameClient/View.cpp
     Source/GameClient/Water.cpp
     Source/GameLogic/AI/AI.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
index b352d5f4200..895c4d0122a 100644
--- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(GAMEENGINEDEVICE_SRC
 #    Include/MilesAudioDevice/MilesAudioManager.h
-    Include/VideoDevice/Bink/BinkVideoPlayer.h
+#    Include/VideoDevice/Bink/BinkVideoPlayer.h
     Include/W3DDevice/Common/W3DConvert.h
     Include/W3DDevice/Common/W3DFunctionLexicon.h
     Include/W3DDevice/Common/W3DModuleFactory.h
@@ -70,7 +70,7 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameClient/W3DTerrainTracks.h
     Include/W3DDevice/GameClient/W3DTerrainVisual.h
     Include/W3DDevice/GameClient/W3DTreeBuffer.h
-    Include/W3DDevice/GameClient/W3DVideobuffer.h
+#    Include/W3DDevice/GameClient/W3DVideoBuffer.h
     Include/W3DDevice/GameClient/W3DView.h
     Include/W3DDevice/GameClient/W3DVolumetricShadow.h
     Include/W3DDevice/GameClient/W3DWater.h
@@ -91,7 +91,7 @@ set(GAMEENGINEDEVICE_SRC
     Include/Win32Device/GameClient/Win32DIMouse.h
     Include/Win32Device/GameClient/Win32Mouse.h
 #    Source/MilesAudioDevice/MilesAudioManager.cpp
-    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+#    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
     Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
     Source/W3DDevice/Common/System/W3DRadar.cpp
     Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
@@ -172,7 +172,7 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
     Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
     Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
-    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
     Source/W3DDevice/GameClient/W3DView.cpp
     Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
     Source/W3DDevice/GameClient/W3DWebBrowser.cpp
@@ -212,21 +212,3 @@ target_link_libraries(z_gameenginedevice PUBLIC
     corei_gameenginedevice_public
     z_gameengine
 )
-
-if(RTS_BUILD_OPTION_FFMPEG)
-    find_package(FFMPEG REQUIRED)
-
-    if(FFMPEG_FOUND)
-        target_sources(z_gameenginedevice PRIVATE
-            Include/VideoDevice/FFmpeg/FFmpegFile.h
-            Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
-            Source/VideoDevice/FFmpeg/FFmpegFile.cpp
-            Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
-        )
-
-        target_include_directories(z_gameenginedevice PRIVATE ${FFMPEG_INCLUDE_DIRS})
-        target_link_directories(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARY_DIRS})
-        target_link_libraries(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARIES})
-        target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_FFMPEG)
-    endif()
-endif()
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
index 679a9e29d0e..8ea6b951046 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -75,7 +75,7 @@ static void drawFramerateBar(void);
 #include "W3DDevice/GameClient/W3DScene.h"
 #include "W3DDevice/GameClient/W3DTerrainTracks.h"
 #include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
+#include "W3DDevice/GameClient/W3DVideoBuffer.h"
 #include "W3DDevice/GameClient/W3DShaderManager.h"
 #include "W3DDevice/GameClient/W3DDebugDisplay.h"
 #include "W3DDevice/GameClient/W3DProjectedShadow.h"
diff --git a/scripts/cpp/unify_move_files.py b/scripts/cpp/unify_move_files.py
index 4c8c298d8b1..9d34e5fb985 100644
--- a/scripts/cpp/unify_move_files.py
+++ b/scripts/cpp/unify_move_files.py
@@ -141,6 +141,21 @@ def main():
     #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/Debug.h", Game.CORE, "GameEngine/Include/Common/Debug.h")
     #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/Debug.cpp", Game.CORE, "GameEngine/Source/Common/System/Debug.cpp")
 
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/VideoPlayer.h", Game.CORE, "GameEngine/Include/GameClient/VideoPlayer.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/VideoPlayer.cpp", Game.CORE, "GameEngine/Source/GameClient/VideoPlayer.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/VideoStream.cpp", Game.CORE, "GameEngine/Source/GameClient/VideoStream.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/WindowVideoManager.h", Game.CORE, "GameEngine/Include/GameClient/WindowVideoManager.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp", Game.CORE, "GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/INI/INIVideo.cpp", Game.CORE, "GameEngine/Source/Common/INI/INIVideo.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h", Game.CORE, "GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp", Game.CORE, "GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h", Game.CORE, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h", Game.CORE, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp", Game.CORE, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp", Game.CORE, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp")
+
     return