avoid the extern keyword in .cpp files

11 files changed, 11 insertions, 22 deletions

diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
index d4fa12d44a..22e035c5a0 100644
--- a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
+++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
@@ -21,9 +21,6 @@
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/VideoConfig.h"
 
-
-extern int frameCount;
-
 namespace DX11
 {
 
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp
index 00e32ed871..6ae5f17a3f 100644
--- a/Source/Core/VideoBackends/D3D/VertexManager.cpp
+++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp
@@ -16,12 +16,10 @@
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VertexLoader.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoConfig.h"
 
-// internal state for loading vertices
-extern NativeVertexFormat *g_nativeVertexFmt;
-
 namespace DX11
 {
 
diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h
index 2ccc00ac0b..c51be20d86 100644
--- a/Source/Core/VideoBackends/OGL/Render.h
+++ b/Source/Core/VideoBackends/OGL/Render.h
@@ -17,7 +17,7 @@ enum GLSL_VERSION {
 };
 
 // ogl-only config, so not in VideoConfig.h
-extern struct VideoConfig {
+struct VideoConfig {
 	bool bSupportsGLSLCache;
 	bool bSupportsGLPinnedMemory;
 	bool bSupportsGLSync;
@@ -35,7 +35,8 @@ extern struct VideoConfig {
 	const char* glsl_version;
 
 	s32 max_samples;
-} g_ogl_config;
+};
+extern VideoConfig g_ogl_config;
 
 class Renderer : public ::Renderer
 {
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp
index 1f3194a6fd..0ac59041b7 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp
@@ -29,9 +29,6 @@
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoConfig.h"
 
-// internal state for loading vertices
-extern NativeVertexFormat *g_nativeVertexFmt;
-
 namespace OGL
 {
 //This are the initially requested size for the buffers expressed in bytes
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp
index bd59779e86..5998b10b09 100644
--- a/Source/Core/VideoBackends/Software/DebugUtil.cpp
+++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp
@@ -15,6 +15,7 @@
 #include "VideoBackends/Software/SWVideoConfig.h"
 #include "VideoBackends/Software/TextureSampler.h"
 
+#include "VideoCommon/Fifo.h"
 #include "VideoCommon/ImageWrite.h"
 
 
diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp
index 9629670a3f..77f141d60a 100644
--- a/Source/Core/VideoBackends/Software/EfbCopy.cpp
+++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp
@@ -14,6 +14,7 @@
 #include "VideoBackends/Software/SWStatistics.h"
 #include "VideoBackends/Software/SWVideoConfig.h"
 #include "VideoBackends/Software/TextureEncoder.h"
+#include "VideoCommon/Fifo.h"
 
 static const float s_gammaLUT[] =
 {
diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
index 524a960d3e..33863c892c 100644
--- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
+++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
@@ -14,6 +14,7 @@
 #include "VideoBackends/Software/SWVideoConfig.h"
 #include "VideoBackends/Software/XFMemLoader.h"
 #include "VideoCommon/DataReader.h"
+#include "VideoCommon/Fifo.h"
 
 typedef void (*DecodingFunction)(u32);
 
diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
index 1a2dcc0cbf..3b80b9ddbf 100644
--- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
@@ -20,6 +20,8 @@
 #include "VideoBackends/Software/SWCommandProcessor.h"
 #include "VideoBackends/Software/VideoBackend.h"
 
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/Fifo.h"
 
 namespace SWCommandProcessor
 {
diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/SWCommandProcessor.h
index dbedc101ac..e30eccfec5 100644
--- a/Source/Core/VideoBackends/Software/SWCommandProcessor.h
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h
@@ -11,9 +11,6 @@
 class PointerWrap;
 namespace MMIO { class Mapping; }
 
-extern volatile bool g_bSkipCurrentFrame;
-extern u8* g_pVideoData;
-
 namespace SWCommandProcessor
 {
 	using UCPStatusReg = CommandProcessor::UCPStatusReg;
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
index f0cc09e3d2..52af0ae1a1 100644
--- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -12,20 +12,13 @@
 #include "VideoBackends/Software/XFMemLoader.h"
 
 #include "VideoCommon/DataReader.h"
+#include "VideoCommon/VertexLoader.h"
 #include "VideoCommon/VertexLoader_Color.h"
 #include "VideoCommon/VertexLoader_Normal.h"
 #include "VideoCommon/VertexLoader_Position.h"
 #include "VideoCommon/VertexLoader_TextCoord.h"
 #include "VideoCommon/VertexManagerBase.h"
 
-// Vertex loaders read these
-extern int tcIndex;
-extern int colIndex;
-extern int colElements[2];
-extern float posScale;
-extern float tcScale[8];
-
-
 SWVertexLoader::SWVertexLoader() :
 	m_VertexSize(0),
 	m_NumAttributeLoaders(0)
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 8abfa81c65..13bd20d154 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -35,6 +35,7 @@
 #include "VideoBackends/Software/VideoConfigDialog.h"
 #endif // HAVE_WX
 
+#include "VideoCommon/Fifo.h"
 #include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/PixelEngine.h"
 #include "VideoCommon/XFMemory.h"