diff --git a/source/NTSC.h b/source/NTSC.h
index c010057e..5e5771fa 100644
--- a/source/NTSC.h
+++ b/source/NTSC.h
@@ -1,31 +1,31 @@
 #pragma once
 
-#include "Video.h"
+#include "Video.h"	// NB. needed by GCC (for fwd enum declaration)
 
 // Globals (Public)
-	extern uint16_t g_nVideoClockVert;
-	extern uint16_t g_nVideoClockHorz;
-	extern uint32_t g_nChromaSize;
+extern uint16_t g_nVideoClockVert;
+extern uint16_t g_nVideoClockHorz;
+extern uint32_t g_nChromaSize;
 
 // Prototypes (Public) ________________________________________________
-	extern void     NTSC_SetVideoMode( uint32_t uVideoModeFlags, bool bDelay=false );
-	extern void     NTSC_SetVideoStyle();
-	extern void     NTSC_SetVideoTextMode( int cols );
-	extern uint32_t*NTSC_VideoGetChromaTable( bool bHueTypeMonochrome, bool bMonitorTypeColorTV );
-	extern void     NTSC_VideoClockResync( const DWORD dwCyclesThisFrame );
-	extern uint16_t NTSC_VideoGetScannerAddress( const ULONG uExecutedCycles );
-	extern uint16_t NTSC_VideoGetScannerAddressForDebugger(void);
-	extern void     NTSC_Destroy(void);
-	extern void     NTSC_VideoInit( uint8_t *pFramebuffer );
-	extern void     NTSC_VideoReinitialize( DWORD cyclesThisFrame, bool bInitVideoScannerAddress );
-	extern void     NTSC_VideoInitAppleType();
-	extern void     NTSC_VideoInitChroma();
-	extern void     NTSC_VideoUpdateCycles( UINT cycles6502 );
-	extern void     NTSC_VideoRedrawWholeScreen( void );
+void NTSC_SetVideoMode(uint32_t uVideoModeFlags, bool bDelay=false);
+void NTSC_SetVideoStyle(void);
+void NTSC_SetVideoTextMode(int cols);
+uint32_t* NTSC_VideoGetChromaTable(bool bHueTypeMonochrome, bool bMonitorTypeColorTV);
+void NTSC_VideoClockResync(const DWORD dwCyclesThisFrame);
+uint16_t NTSC_VideoGetScannerAddress(const ULONG uExecutedCycles);
+uint16_t NTSC_VideoGetScannerAddressForDebugger(void);
+void NTSC_Destroy(void);
+void NTSC_VideoInit(uint8_t *pFramebuffer);
+void NTSC_VideoReinitialize(DWORD cyclesThisFrame, bool bInitVideoScannerAddress);
+void NTSC_VideoInitAppleType(void);
+void NTSC_VideoInitChroma(void);
+void NTSC_VideoUpdateCycles(UINT cycles6502);
+void NTSC_VideoRedrawWholeScreen(void);
 
-	void NTSC_SetRefreshRate(VideoRefreshRate_e rate);
-	UINT NTSC_GetCyclesPerFrame(void);
-	UINT NTSC_GetCyclesPerLine(void);
-	UINT NTSC_GetVideoLines(void);
-	UINT NTSC_GetCyclesUntilVBlank(int cycles);
-	bool NTSC_IsVisible(void);
+void NTSC_SetRefreshRate(VideoRefreshRate_e rate);
+UINT NTSC_GetCyclesPerFrame(void);
+UINT NTSC_GetCyclesPerLine(void);
+UINT NTSC_GetVideoLines(void);
+UINT NTSC_GetCyclesUntilVBlank(int cycles);
+bool NTSC_IsVisible(void);
diff --git a/source/Video.cpp b/source/Video.cpp
index 9b0f20dc..4b45ec6e 100644
--- a/source/Video.cpp
+++ b/source/Video.cpp
@@ -862,7 +862,7 @@ void Video::Video_RedrawAndTakeScreenShot(const char* pScreenshotFilename)
 		return;
 
 	GetFrame().VideoRedrawScreen();
-	Video_SaveScreenShot(Video::SCREENSHOT_560x384, pScreenshotFilename);
+	Video_SaveScreenShot(SCREENSHOT_560x384, pScreenshotFilename);
 }
 
 void Video::VideoRefreshScreen(uint32_t uRedrawWholeScreenVideoMode, bool bRedrawWholeScreen)