diff --git a/source/6821.h b/source/6821.h
index 5b269581..c3aff37e 100644
--- a/source/6821.h
+++ b/source/6821.h
@@ -1,3 +1,5 @@
+#pragma once
+
 /*
  * mc6821.h - MC6821 emulation for the 1571 disk drives with DD3.
  *
diff --git a/source/AY8910.cpp b/source/AY8910.cpp
index 686ba78a..35e066b4 100644
--- a/source/AY8910.cpp
+++ b/source/AY8910.cpp
@@ -26,7 +26,6 @@
 
 #include "StdAfx.h"
 
-#include <stdio.h>
 #include "AY8910.h"
 
 #include "Applewin.h"		// For g_fh
diff --git a/source/AY8910.h b/source/AY8910.h
index 42962649..85b246b3 100644
--- a/source/AY8910.h
+++ b/source/AY8910.h
@@ -1,5 +1,4 @@
-#ifndef AY8910_H
-#define AY8910_H
+#pragma once
 
 #define MAX_8910 4
 
@@ -87,5 +86,3 @@ private:
 	// Vars shared between all AY's
 	static double m_fCurrentCLK_AY8910;
 };
-
-#endif
diff --git a/source/CPU.cpp b/source/CPU.cpp
index eaba074b..cc4ea779 100644
--- a/source/CPU.cpp
+++ b/source/CPU.cpp
@@ -86,9 +86,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "CPU.h"
 #include "Applewin.h"
 #include "CardManager.h"
-#include "CPU.h"
 #include "Frame.h"
 #include "Memory.h"
 #include "Mockingboard.h"
diff --git a/source/CPU.h b/source/CPU.h
index c8bab5c5..bd2aab11 100644
--- a/source/CPU.h
+++ b/source/CPU.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common.h"
+
 struct regsrec
 {
   BYTE a;   // accumulator
diff --git a/source/CardManager.cpp b/source/CardManager.cpp
index 2da5a2d7..3b13f0fc 100644
--- a/source/CardManager.cpp
+++ b/source/CardManager.cpp
@@ -29,8 +29,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
-#include "Applewin.h"
 #include "CardManager.h"
+#include "Applewin.h"
 
 #include "Disk.h"
 #include "MouseInterface.h"
diff --git a/source/CardManager.h b/source/CardManager.h
index 3e9d5b8f..d7807d1d 100644
--- a/source/CardManager.h
+++ b/source/CardManager.h
@@ -2,6 +2,7 @@
 
 #include "Card.h"
 #include "Disk2CardManager.h"
+#include "Common.h"
 
 class CardManager
 {
diff --git a/source/Configuration/About.cpp b/source/Configuration/About.cpp
index 0b907569..3dbd7cc5 100644
--- a/source/Configuration/About.cpp
+++ b/source/Configuration/About.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "About.h"
 #include "../Applewin.h"
 #include "../Frame.h"
 #include "../resource/resource.h"
diff --git a/source/Configuration/About.h b/source/Configuration/About.h
index 3fffba27..fa854fe1 100644
--- a/source/Configuration/About.h
+++ b/source/Configuration/About.h
@@ -1 +1,3 @@
+#pragma once
+
 bool AboutDlg(void);
diff --git a/source/Configuration/IPropertySheet.h b/source/Configuration/IPropertySheet.h
index b6b7a4e3..f3061104 100644
--- a/source/Configuration/IPropertySheet.h
+++ b/source/Configuration/IPropertySheet.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common.h"
+
 class CConfigNeedingRestart;
 
 __interface IPropertySheet
diff --git a/source/Configuration/PageAdvanced.cpp b/source/Configuration/PageAdvanced.cpp
index 63924fb9..f3b286f0 100644
--- a/source/Configuration/PageAdvanced.cpp
+++ b/source/Configuration/PageAdvanced.cpp
@@ -22,14 +22,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include "StdAfx.h"
-#include "../Common.h"
+#include "PageAdvanced.h"
+#include "PropertySheetHelper.h"
 
+#include "../Common.h"
 #include "../ParallelPrinter.h"
 #include "../Registry.h"
 #include "../SaveState.h"
 #include "../resource/resource.h"
-#include "PageAdvanced.h"
-#include "PropertySheetHelper.h"
 
 CPageAdvanced* CPageAdvanced::ms_this = 0;	// reinit'd in ctor
 
diff --git a/source/Configuration/PageAdvanced.h b/source/Configuration/PageAdvanced.h
index 35ecaa7f..7a348867 100644
--- a/source/Configuration/PageAdvanced.h
+++ b/source/Configuration/PageAdvanced.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "IPropertySheetPage.h"
 #include "PropertySheetDefs.h"
+#include "IPropertySheetPage.h"
+#include "Common.h"
+
 class CPropertySheetHelper;
 
 class CPageAdvanced : private IPropertySheetPage
diff --git a/source/Configuration/PageConfig.cpp b/source/Configuration/PageConfig.cpp
index 36ceeaac..7e98c129 100644
--- a/source/Configuration/PageConfig.cpp
+++ b/source/Configuration/PageConfig.cpp
@@ -23,14 +23,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "PageConfig.h"
+#include "PropertySheetHelper.h"
+
 #include "../Applewin.h"
 #include "../Frame.h"
 #include "../Registry.h"
 #include "../SerialComms.h"
 #include "../Video.h"
 #include "../resource/resource.h"
-#include "PageConfig.h"
-#include "PropertySheetHelper.h"
 
 CPageConfig* CPageConfig::ms_this = 0;	// reinit'd in ctor
 
diff --git a/source/Configuration/PageConfig.h b/source/Configuration/PageConfig.h
index 739b1e33..e5d03daa 100644
--- a/source/Configuration/PageConfig.h
+++ b/source/Configuration/PageConfig.h
@@ -3,6 +3,8 @@
 #include "IPropertySheetPage.h"
 #include "PropertySheetDefs.h"
 #include "PageConfigTfe.h"
+#include "Common.h"
+
 class CPropertySheetHelper;
 
 class CPageConfig : private IPropertySheetPage
diff --git a/source/Configuration/PageConfigTfe.cpp b/source/Configuration/PageConfigTfe.cpp
index 2d73fe2a..2d4acaa4 100644
--- a/source/Configuration/PageConfigTfe.cpp
+++ b/source/Configuration/PageConfigTfe.cpp
@@ -23,12 +23,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "PageConfigTfe.h"
+
 #include "../Common.h"
 #include "../Registry.h"
 #include "../resource/resource.h"
 #include "../Tfe/Tfe.h"
 #include "../Tfe/Tfesupp.h"
-#include "PageConfigTfe.h"
 
 CPageConfigTfe* CPageConfigTfe::ms_this = 0;	// reinit'd in ctor
 
diff --git a/source/Configuration/PageDisk.cpp b/source/Configuration/PageDisk.cpp
index f74d339f..f1ef999e 100644
--- a/source/Configuration/PageDisk.cpp
+++ b/source/Configuration/PageDisk.cpp
@@ -23,14 +23,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "PageDisk.h"
+#include "PropertySheetHelper.h"
+
 #include "../Applewin.h"
 #include "../CardManager.h"
 #include "../Disk.h"	// Drive_e, Disk_Status_e
 #include "../Frame.h"
 #include "../Registry.h"
 #include "../resource/resource.h"
-#include "PageDisk.h"
-#include "PropertySheetHelper.h"
 
 CPageDisk* CPageDisk::ms_this = 0;	// reinit'd in ctor
 
diff --git a/source/Configuration/PageInput.cpp b/source/Configuration/PageInput.cpp
index 9a79fdba..db46f844 100644
--- a/source/Configuration/PageInput.cpp
+++ b/source/Configuration/PageInput.cpp
@@ -22,14 +22,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include "StdAfx.h"
+
+#include "PageInput.h"
+#include "PropertySheetHelper.h"
+
 #include "../SaveState_Structs_common.h"
 #include "../Common.h"
-
 #include "../Keyboard.h"
 #include "../Registry.h"
 #include "../resource/resource.h"
-#include "PageInput.h"
-#include "PropertySheetHelper.h"
 
 CPageInput* CPageInput::ms_this = 0;	// reinit'd in ctor
 
diff --git a/source/Configuration/PageSound.cpp b/source/Configuration/PageSound.cpp
index 806d75f8..a481600a 100644
--- a/source/Configuration/PageSound.cpp
+++ b/source/Configuration/PageSound.cpp
@@ -22,16 +22,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include "StdAfx.h"
+
+#include "PageSound.h"
+#include "PropertySheetHelper.h"
+
 #include "../SaveState_Structs_common.h"
 #include "../Common.h"
-
 #include "../CardManager.h"
 #include "../Mockingboard.h"
 #include "../Registry.h"
 #include "../Speaker.h"
 #include "../resource/resource.h"
-#include "PageSound.h"
-#include "PropertySheetHelper.h"
 
 CPageSound* CPageSound::ms_this = 0;	// reinit'd in ctor
 
diff --git a/source/Configuration/PageSound.h b/source/Configuration/PageSound.h
index a69f4474..9748d123 100644
--- a/source/Configuration/PageSound.h
+++ b/source/Configuration/PageSound.h
@@ -2,6 +2,8 @@
 
 #include "IPropertySheetPage.h"
 #include "PropertySheetDefs.h"
+#include "Card.h"
+
 class CPropertySheetHelper;
 
 class CPageSound : private IPropertySheetPage
diff --git a/source/Configuration/PropertySheet.cpp b/source/Configuration/PropertySheet.cpp
index 65b4367a..84385c56 100644
--- a/source/Configuration/PropertySheet.cpp
+++ b/source/Configuration/PropertySheet.cpp
@@ -29,10 +29,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "PropertySheet.h"
+
 #include "../Applewin.h"
 #include "../Frame.h"
 #include "../resource/resource.h"
-#include "PropertySheet.h"
 
 void CPropertySheet::Init(void)
 {
diff --git a/source/Configuration/PropertySheetHelper.cpp b/source/Configuration/PropertySheetHelper.cpp
index 9e4cdd43..3c9be3d2 100644
--- a/source/Configuration/PropertySheetHelper.cpp
+++ b/source/Configuration/PropertySheetHelper.cpp
@@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "PropertySheetHelper.h"
+#include "IPropertySheet.h"
+
 #include "../Applewin.h"	// g_nAppMode, g_uScrollLockToggle, sg_PropertySheet
 #include "../CardManager.h"
 #include "../Disk.h"
@@ -30,8 +33,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "../Log.h"
 #include "../Registry.h"
 #include "../SaveState.h"
-#include "IPropertySheet.h"
-#include "PropertySheetHelper.h"
 
 /*
 Config causing AfterClose msgs:
diff --git a/source/DirectInput.cpp b/source/DirectInput.cpp
index f026e87e..e514ea2f 100644
--- a/source/DirectInput.cpp
+++ b/source/DirectInput.cpp
@@ -33,12 +33,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //=============================================================================
 
 //#define STRICT
-#define DIRECTINPUT_VERSION 0x0800
 
+#include "DirectInput.h"
 #include "SoundCore.h"	// SAFE_RELEASE()
 #include "Log.h"
-#include "DirectInput.h"
 #include "Common.h"
+
+#define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 
 extern bool g_bDisableDirectInput;	// currently in AppleWin.h
diff --git a/source/Disk.cpp b/source/Disk.cpp
index 762a42c4..226672a6 100644
--- a/source/Disk.cpp
+++ b/source/Disk.cpp
@@ -30,11 +30,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Disk.h"
+
 #include "SaveState_Structs_v1.h"
 
 #include "Applewin.h"
 #include "CPU.h"
-#include "Disk.h"
 #include "DiskImage.h"
 #include "Frame.h"
 #include "Log.h"
diff --git a/source/Disk2CardManager.cpp b/source/Disk2CardManager.cpp
index a56b4946..4e1d18a6 100644
--- a/source/Disk2CardManager.cpp
+++ b/source/Disk2CardManager.cpp
@@ -29,10 +29,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Disk2CardManager.h"
 #include "Applewin.h"
 #include "CardManager.h"
 #include "Disk.h"
-#include "Disk2CardManager.h"
 
 bool Disk2CardManager::IsConditionForFullSpeed(void)
 {
diff --git a/source/DiskFormatTrack.cpp b/source/DiskFormatTrack.cpp
index 20e2d8c8..8da9f20e 100644
--- a/source/DiskFormatTrack.cpp
+++ b/source/DiskFormatTrack.cpp
@@ -44,6 +44,7 @@ Writes the following: (in 1 continuous write operation)
 
 #include "StdAfx.h"
 
+#include "DiskFormatTrack.h"
 #include "Disk.h"
 #include "Log.h"
 #include "YamlHelper.h"
diff --git a/source/DiskFormatTrack.h b/source/DiskFormatTrack.h
index 00692a15..a2dd2734 100644
--- a/source/DiskFormatTrack.h
+++ b/source/DiskFormatTrack.h
@@ -23,6 +23,8 @@ along with AppleWin; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include "DiskLog.h"
+
 class FormatTrack	// Monitor for formatting of track
 {
 public:
diff --git a/source/DiskImage.cpp b/source/DiskImage.cpp
index 96b58206..e3832c98 100644
--- a/source/DiskImage.cpp
+++ b/source/DiskImage.cpp
@@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
-#include "Common.h"
 #include "DiskImage.h"
+#include "Common.h"
 #include "DiskImageHelper.h"
 
 
diff --git a/source/DiskImageHelper.cpp b/source/DiskImageHelper.cpp
index 3c6195b5..5dbe3b2a 100644
--- a/source/DiskImageHelper.cpp
+++ b/source/DiskImageHelper.cpp
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
 #include "StdAfx.h"
+#include "DiskImageHelper.h"
+
 #include "Common.h"
 
 #include "zlib.h"
@@ -35,7 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "CPU.h"
 #include "DiskImage.h"
-#include "DiskImageHelper.h"
 #include "Log.h"
 #include "Memory.h"
 
diff --git a/source/DiskImageHelper.h b/source/DiskImageHelper.h
index a5271843..5576858b 100644
--- a/source/DiskImageHelper.h
+++ b/source/DiskImageHelper.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "DiskDefs.h"
+#include "DiskImage.h"
 #include "zip.h"
 
 #define GZ_SUFFIX ".gz"
diff --git a/source/DiskLog.h b/source/DiskLog.h
index a6940f7e..c098226a 100644
--- a/source/DiskLog.h
+++ b/source/DiskLog.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #define LOG_DISK_ENABLED 0	// Master enable
 
 #define LOG_DISK_TRACKS 1
diff --git a/source/Frame.cpp b/source/Frame.cpp
index ae300ad9..e40d9edc 100644
--- a/source/Frame.cpp
+++ b/source/Frame.cpp
@@ -27,15 +27,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "StdAfx.h"
-#include <sys/stat.h>
 
+#include "Frame.h"
 #include "Applewin.h"
 #include "CardManager.h"
 #include "CPU.h"
 #include "Disk.h"
 #include "DiskImage.h"
 #include "Harddisk.h"
-#include "Frame.h"
 #include "Keyboard.h"
 #include "Log.h"
 #include "Memory.h"
diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp
index 329828d3..c13b556f 100644
--- a/source/Harddisk.cpp
+++ b/source/Harddisk.cpp
@@ -28,13 +28,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Harddisk.h"
 #include "Applewin.h"
 #include "CardManager.h"
 #include "CPU.h"
 #include "DiskImage.h"	// ImageError_e, Disk_Status_e
 #include "DiskImageHelper.h"
 #include "Frame.h"
-#include "Harddisk.h"
 #include "Memory.h"
 #include "Registry.h"
 #include "SaveState.h"
diff --git a/source/Harddisk.h b/source/Harddisk.h
index 264751aa..1f28bb66 100644
--- a/source/Harddisk.h
+++ b/source/Harddisk.h
@@ -23,6 +23,8 @@ along with AppleWin; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include "DiskImage.h"
+
 	enum HardDrive_e
 	{
 		HARDDISK_1 = 0,
diff --git a/source/Joystick.cpp b/source/Joystick.cpp
index dda6abfd..1c1573b5 100644
--- a/source/Joystick.cpp
+++ b/source/Joystick.cpp
@@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Joystick.h"
 #include "Applewin.h"
 #include "CPU.h"
 #include "Memory.h"
diff --git a/source/Joystick.h b/source/Joystick.h
index c354f1ec..fef6afdf 100644
--- a/source/Joystick.h
+++ b/source/Joystick.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Common.h"
 enum JOYNUM {JN_JOYSTICK0=0, JN_JOYSTICK1};
 
 enum JOY0CHOICE {J0C_DISABLED=0, J0C_JOYSTICK1, J0C_KEYBD_CURSORS, J0C_KEYBD_NUMPAD, J0C_MOUSE, J0C_MAX};
diff --git a/source/Keyboard.cpp b/source/Keyboard.cpp
index 744314f8..abd14a50 100644
--- a/source/Keyboard.cpp
+++ b/source/Keyboard.cpp
@@ -28,9 +28,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Keyboard.h"
 #include "Applewin.h"
 #include "Frame.h"
-#include "Keyboard.h"
 #include "Pravets.h"
 #include "Tape.h"
 #include "YamlHelper.h"
diff --git a/source/LanguageCard.cpp b/source/LanguageCard.cpp
index c6679dbd..c24974ec 100644
--- a/source/LanguageCard.cpp
+++ b/source/LanguageCard.cpp
@@ -28,9 +28,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "LanguageCard.h"
 #include "Applewin.h"
 #include "CPU.h"		// GH#700
-#include "LanguageCard.h"
 #include "Log.h"
 #include "Memory.h"
 #include "YamlHelper.h"
diff --git a/source/Log.cpp b/source/Log.cpp
index 15f9dade..a1137aa3 100644
--- a/source/Log.cpp
+++ b/source/Log.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Log.h"
 FILE* g_fh = NULL;
 
 //---------------------------------------------------------------------------
diff --git a/source/Memory.cpp b/source/Memory.cpp
index 64e9a8f2..7628c4ce 100644
--- a/source/Memory.cpp
+++ b/source/Memory.cpp
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Memory.h"
 #include "Applewin.h"
 #include "CardManager.h"
 #include "CPU.h"
@@ -40,7 +41,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Keyboard.h"
 #include "LanguageCard.h"
 #include "Log.h"
-#include "Memory.h"
 #include "Mockingboard.h"
 #include "MouseInterface.h"
 #include "Video.h"
diff --git a/source/Memory.h b/source/Memory.h
index be729895..921d437a 100644
--- a/source/Memory.h
+++ b/source/Memory.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common.h"
+
 // Memory Flag
 #define  MF_80STORE    0x00000001
 #define  MF_ALTZP      0x00000002
diff --git a/source/Mockingboard.cpp b/source/Mockingboard.cpp
index c5f9b330..fafea58b 100644
--- a/source/Mockingboard.cpp
+++ b/source/Mockingboard.cpp
@@ -77,6 +77,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Mockingboard.h"
 #include "SaveState_Structs_v1.h"
 
 #include "Applewin.h"
@@ -84,7 +85,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "CPU.h"
 #include "Log.h"
 #include "Memory.h"
-#include "Mockingboard.h"
 #include "SoundCore.h"
 #include "SynchronousEventManager.h"
 #include "YamlHelper.h"
diff --git a/source/MouseInterface.cpp b/source/MouseInterface.cpp
index fa6f74fd..ed896dd0 100644
--- a/source/MouseInterface.cpp
+++ b/source/MouseInterface.cpp
@@ -41,6 +41,8 @@ Etc.
 
 
 #include "StdAfx.h"
+
+#include "MouseInterface.h"
 #include "SaveState_Structs_common.h"
 #include "Common.h"
 
@@ -50,7 +52,6 @@ Etc.
 #include "Frame.h"	// FrameSetCursorPosByMousePos()
 #include "Log.h"
 #include "Memory.h"
-#include "MouseInterface.h"
 #include "Video.h"
 #include "NTSC.h"	// NTSC_GetCyclesUntilVBlank()
 #include "YamlHelper.h"
diff --git a/source/MouseInterface.h b/source/MouseInterface.h
index 4dc122de..6b142d1a 100644
--- a/source/MouseInterface.h
+++ b/source/MouseInterface.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "6821.h"
 #include "Common.h"
 #include "Card.h"
diff --git a/source/NTSC.cpp b/source/NTSC.cpp
index b3342859..2260bb30 100644
--- a/source/NTSC.cpp
+++ b/source/NTSC.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 // Includes
 	#include "StdAfx.h"
+	#include "NTSC.h"
 	#include "Applewin.h"
 	#include "CPU.h"	// CpuGetCyclesThisVideoFrame()
 	#include "Frame.h"
@@ -28,7 +29,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	#include "Video.h"  // g_pFramebufferbits
 	#include "RGBMonitor.h"
 
-	#include "NTSC.h"
 	#include "NTSC_CharSet.h"
 
 
diff --git a/source/NTSC.h b/source/NTSC.h
index 26386e4d..fc629553 100644
--- a/source/NTSC.h
+++ b/source/NTSC.h
@@ -1,3 +1,5 @@
+#pragma once
+
 // Globals (Public)
 	extern uint16_t g_nVideoClockVert;
 	extern uint16_t g_nVideoClockHorz;
diff --git a/source/NTSC_CharSet.cpp b/source/NTSC_CharSet.cpp
index 2c8d1eb7..ff223e5e 100644
--- a/source/NTSC_CharSet.cpp
+++ b/source/NTSC_CharSet.cpp
@@ -20,11 +20,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include "StdAfx.h"
+#include "NTSC_CharSet.h"
 #include "Applewin.h"
 #include "../resource/resource.h"
 #include "Video.h"
 
-#include "NTSC_CharSet.h"
 
 unsigned char csbits_enhanced2e[2][256][8];	// Enhanced //e (2732 4K video ROM)
 static unsigned char csbits_2e_pal[2][256][8];	// PAL Original or Enhanced //e (2764 8K video ROM - low 4K) via rocker switch under keyboard
diff --git a/source/ParallelPrinter.cpp b/source/ParallelPrinter.cpp
index 588e87ba..c0978d34 100644
--- a/source/ParallelPrinter.cpp
+++ b/source/ParallelPrinter.cpp
@@ -28,10 +28,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "ParallelPrinter.h"
 #include "Applewin.h"
 #include "Frame.h"	// g_hFrameWindow
 #include "Memory.h"
-#include "ParallelPrinter.h"
 #include "Registry.h"
 #include "YamlHelper.h"
 
diff --git a/source/Pravets.cpp b/source/Pravets.cpp
index a216c62c..cb1e684a 100644
--- a/source/Pravets.cpp
+++ b/source/Pravets.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Pravets.h"
 #include "Applewin.h"
 #include "Frame.h"
 #include "Keyboard.h"
diff --git a/source/RGBMonitor.cpp b/source/RGBMonitor.cpp
index 69044c68..edfee954 100644
--- a/source/RGBMonitor.cpp
+++ b/source/RGBMonitor.cpp
@@ -2,11 +2,11 @@
 
 #include "StdAfx.h"
 
+#include "RGBMonitor.h"
 #include "Frame.h"
 #include "Memory.h" // MemGetMainPtr() MemGetAuxPtr()
 #include "Video.h"
 #include "Card.h"
-#include "RGBMonitor.h"
 #include "YamlHelper.h"
 
 
diff --git a/source/RGBMonitor.h b/source/RGBMonitor.h
index c915d4c7..4b93bf14 100644
--- a/source/RGBMonitor.h
+++ b/source/RGBMonitor.h
@@ -1,3 +1,7 @@
+#pragma once
+
+#include "Video.h"
+
 // Handling of RGB videocards
 
 enum RGB_Videocard_e
diff --git a/source/Registry.cpp b/source/Registry.cpp
index 74835f60..59ea7483 100644
--- a/source/Registry.cpp
+++ b/source/Registry.cpp
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Registry.h"
+
 extern std::string g_sConfigFile;
 
 namespace _ini {
diff --git a/source/SAM.cpp b/source/SAM.cpp
index 2e716212..c255590d 100644
--- a/source/SAM.cpp
+++ b/source/SAM.cpp
@@ -32,9 +32,9 @@
 */
 #include "StdAfx.h"
 
+#include "SAM.h"
 #include "Applewin.h"
 #include "Memory.h"
-#include "SAM.h"
 #include "Speaker.h"
 
 //
diff --git a/source/SaveState.cpp b/source/SaveState.cpp
index bcee5e86..7c63427d 100644
--- a/source/SaveState.cpp
+++ b/source/SaveState.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "SaveState.h"
 #include "YamlHelper.h"
 
 #include "Applewin.h"
diff --git a/source/SerialComms.cpp b/source/SerialComms.cpp
index b07d18ab..444abeb2 100644
--- a/source/SerialComms.cpp
+++ b/source/SerialComms.cpp
@@ -35,12 +35,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "SerialComms.h"
 #include "Applewin.h"
 #include "CPU.h"
 #include "Frame.h"
 #include "Log.h"
 #include "Memory.h"
-#include "SerialComms.h"
 #include "YamlHelper.h"
 
 #include "../resource/resource.h"
diff --git a/source/SoundCore.cpp b/source/SoundCore.cpp
index 29d66d52..17fd4b3d 100644
--- a/source/SoundCore.cpp
+++ b/source/SoundCore.cpp
@@ -28,10 +28,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "SoundCore.h"
 #include "Applewin.h"
 #include "Frame.h"
 #include "Log.h"
-#include "SoundCore.h"
 #include "Speaker.h"
 
 //-----------------------------------------------------------------------------
diff --git a/source/Speaker.cpp b/source/Speaker.cpp
index 43756f5f..3c94fbfa 100644
--- a/source/Speaker.cpp
+++ b/source/Speaker.cpp
@@ -28,13 +28,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Speaker.h"
 #include "Applewin.h"
 #include "CPU.h"
 #include "Frame.h"
 #include "Log.h"
 #include "Memory.h"
 #include "SoundCore.h"
-#include "Speaker.h"
 #include "Video.h"	// VideoRedrawScreen()
 #include "YamlHelper.h"
 #include "Riff.h"
diff --git a/source/Speech.cpp b/source/Speech.cpp
index ff314acc..e0a6581f 100644
--- a/source/Speech.cpp
+++ b/source/Speech.cpp
@@ -1,8 +1,9 @@
 #include "StdAfx.h"
 
+#include "Speech.h"
+
 #ifdef USE_SPEECH_API
 #include <sapi.h>
-#include "Speech.h"
 
 CSpeech::~CSpeech(void)
 {
diff --git a/source/Speech.h b/source/Speech.h
index 3af1a764..128711f2 100644
--- a/source/Speech.h
+++ b/source/Speech.h
@@ -1,3 +1,5 @@
+#pragma once
+
 struct ISpVoice;
 
 class CSpeech
diff --git a/source/SynchronousEventManager.cpp b/source/SynchronousEventManager.cpp
index 855706fb..0faa2b57 100644
--- a/source/SynchronousEventManager.cpp
+++ b/source/SynchronousEventManager.cpp
@@ -41,8 +41,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
-#include "Applewin.h"
 #include "SynchronousEventManager.h"
+#include "Applewin.h"
 
 void SynchronousEventManager::Insert(SyncEvent* pNewEvent)
 {
diff --git a/source/Tape.cpp b/source/Tape.cpp
index e9db85cc..6f267e4f 100644
--- a/source/Tape.cpp
+++ b/source/Tape.cpp
@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Tape.h"
 #include "Applewin.h"
 #include "Keyboard.h"
 #include "Memory.h"
diff --git a/source/Video.cpp b/source/Video.cpp
index d3879144..74e4a8a8 100644
--- a/source/Video.cpp
+++ b/source/Video.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
+#include "Video.h"
 #include "Applewin.h"
 #include "CPU.h"
 #include "Disk.h"		// DiskUpdateDriveState()
@@ -36,7 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Log.h"
 #include "Memory.h"
 #include "Registry.h"
-#include "Video.h"
 #include "NTSC.h"
 #include "RGBMonitor.h"
 
diff --git a/source/YamlHelper.cpp b/source/YamlHelper.cpp
index 7f444f49..8c819117 100644
--- a/source/YamlHelper.cpp
+++ b/source/YamlHelper.cpp
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 
-#include "Log.h"
 #include "YamlHelper.h"
+#include "Log.h"
 
 int YamlHelper::InitParser(const char* pPathname)
 {
diff --git a/source/z80emu.cpp b/source/z80emu.cpp
index 94bb0a91..b60d707a 100644
--- a/source/z80emu.cpp
+++ b/source/z80emu.cpp
@@ -15,10 +15,10 @@
 
 #include "StdAfx.h"
 
+#include "z80emu.h"
 #include "Applewin.h"
 #include "CPU.h"
 #include "Memory.h"
-#include "z80emu.h"
 
 // Variaveis
 static int g_uCPMZ80Slot = 0;
diff --git a/source/z80emu.h b/source/z80emu.h
index 1cba98e9..350a09fc 100644
--- a/source/z80emu.h
+++ b/source/z80emu.h
@@ -1,3 +1,5 @@
+#pragma once
+
 /*  Emulador do computador TK3000 //e (Microdigital)
  *  por Fábio Belavenuto - Copyright (C) 2004
  *