From 04beb1f29f10f48eeb2d91e6de4949a7bb41eb38 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 28 Apr 2009 20:26:43 +0000
Subject: [PATCH] wxGui branch: [linux] Minor fixes to the GUI -- Ok/Cancel
 buttons line up where they should now. :) CodeBlocks Project Changes:  *
 Fixed some absolute folder specifications (/home/pubuntu/) which went
 unnoticed.  * Enabled Precompiled header support (speeds up compilation about
 40% for me).

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1081 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 3rdparty/SoundTouch/SoundTouch.cbp         |   6 +-
 3rdparty/bzip2/bzip2.cbp                   |   6 +-
 3rdparty/zlib/zlib.cbp                     |   6 +-
 common/include/PS2Etypes.h                 |   8 +-
 common/include/Pcsx2Defs.h                 |  18 +-
 pcsx2/NewGUI/CheckedStaticBox.cpp          |  30 +-
 pcsx2/NewGUI/CheckedStaticBox.h            |   5 +-
 pcsx2/NewGUI/LogOptionsDialog.cpp          |  16 +-
 pcsx2/NewGUI/wxHelpers.cpp                 |  13 +-
 pcsx2/NewGUI/wxHelpers.h                   |   6 +-
 pcsx2/PrecompiledHeader.h                  |  12 +-
 pcsx2/SafeArray.h                          |  49 +-
 pcsx2/System.h                             |  10 +-
 pcsx2/windows/SamplProf.cpp                |   3 +-
 pcsx2/windows/VCprojects/pcsx2_2008.vcproj | 808 +--------------------
 pcsx2/windows/Win32.h                      |   5 +-
 pcsx2/windows/WinMisc.cpp                  |   3 +-
 pcsx2/windows/WinThreads.cpp               |   3 +-
 pcsx2/x86/ix86/ix86.h                      |   4 +-
 19 files changed, 104 insertions(+), 907 deletions(-)

diff --git a/3rdparty/SoundTouch/SoundTouch.cbp b/3rdparty/SoundTouch/SoundTouch.cbp
index 639232d113..00fcdbec23 100644
--- a/3rdparty/SoundTouch/SoundTouch.cbp
+++ b/3rdparty/SoundTouch/SoundTouch.cbp
@@ -9,7 +9,7 @@
 			<Target title="Debug">
 				<Option output="../../deps/debug/libsoundtouch-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/debug" />
+				<Option object_output="./.objs/debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -21,7 +21,7 @@
 			<Target title="Release">
 				<Option output="../../deps/libsoundtouch" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/release" />
+				<Option object_output="./.objs/release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -37,7 +37,7 @@
 			<Target title="Devel">
 				<Option output="../../deps/devel/libsoundtouch-dev" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/devel" />
+				<Option object_output="./.objs/devel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/3rdparty/bzip2/bzip2.cbp b/3rdparty/bzip2/bzip2.cbp
index 822d736410..df2541ac01 100644
--- a/3rdparty/bzip2/bzip2.cbp
+++ b/3rdparty/bzip2/bzip2.cbp
@@ -9,7 +9,7 @@
 			<Target title="Debug">
 				<Option output="../../deps/debug/libbzip2-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/debug" />
+				<Option object_output="./.objs/debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -21,7 +21,7 @@
 			<Target title="Release">
 				<Option output="../../deps/libbzip2" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/release" />
+				<Option object_output="./.objs/release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -37,7 +37,7 @@
 			<Target title="Devel">
 				<Option output="../../deps/devel/libbzip2-dev" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/devel" />
+				<Option object_output="./.objs/devel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/3rdparty/zlib/zlib.cbp b/3rdparty/zlib/zlib.cbp
index 5e7d5be352..8d34e52645 100644
--- a/3rdparty/zlib/zlib.cbp
+++ b/3rdparty/zlib/zlib.cbp
@@ -9,7 +9,7 @@
 			<Target title="Debug">
 				<Option output="../../deps/debug/zlib-dbg" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/debug" />
+				<Option object_output="./.objs/debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -22,7 +22,7 @@
 			<Target title="Release">
 				<Option output="../../deps/zlib" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/release" />
+				<Option object_output="./.objs/release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -35,7 +35,7 @@
 			<Target title="Devel">
 				<Option output="../../deps/devel/zlib-dev" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/devel" />
+				<Option object_output="./.objs/devel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/common/include/PS2Etypes.h b/common/include/PS2Etypes.h
index 474eb50eff..1c84956015 100644
--- a/common/include/PS2Etypes.h
+++ b/common/include/PS2Etypes.h
@@ -5,12 +5,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 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, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
@@ -18,6 +18,8 @@
 #ifndef __PS2ETYPES_H__
 #define __PS2ETYPES_H__
 
+#include <stddef.h>
+
 #if defined (__linux__) && !defined(__LINUX__)  // some distributions are lower case
 #define __LINUX__
 #endif
@@ -86,7 +88,7 @@ typedef unsigned int uint;
 
 #define __naked __declspec(naked)
 #define __unused /*unused*/
-#define __noinline __declspec(noinline) 
+#define __noinline __declspec(noinline)
 #define CALLBACK    __stdcall
 
 #else // _MSC_VER
diff --git a/common/include/Pcsx2Defs.h b/common/include/Pcsx2Defs.h
index dbaf5ca315..be493bb3c8 100644
--- a/common/include/Pcsx2Defs.h
+++ b/common/include/Pcsx2Defs.h
@@ -5,26 +5,28 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 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, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
- 
+
 #ifndef __PCSX2DEFS_H__
 #define __PCSX2DEFS_H__
 
-#if defined (__linux__) && !defined(__LINUX__)  // some distributions are lower case
-#define __LINUX__
-#endif
+#ifndef __LINUX__
+#	if defined (__linux__)   // some distributions are lower case
+#		define __LINUX__
+#	endif
 
-#ifdef __CYGWIN__
-#define __LINUX__
+#	ifdef __CYGWIN__
+#		define __LINUX__
+#	endif
 #endif
 
 // Renamed ARRAYSIZE to ArraySize -- looks nice and gets rid of Windows.h conflicts (air)
diff --git a/pcsx2/NewGUI/CheckedStaticBox.cpp b/pcsx2/NewGUI/CheckedStaticBox.cpp
index 660c04886e..2d3856c557 100644
--- a/pcsx2/NewGUI/CheckedStaticBox.cpp
+++ b/pcsx2/NewGUI/CheckedStaticBox.cpp
@@ -21,27 +21,19 @@
 
 CheckedStaticBox::CheckedStaticBox( wxWindow* parent, int orientation, const wxString& title, int id ) :
 	wxPanel( parent ),
-	m_StaticBoxSizer( *new wxStaticBoxSizer( wxVERTICAL, this ) ),
-	ThisToggle( *new wxCheckBox( this, id, title, wxPoint( 8, 1 ) ) ),
-	ThisSizer( ( orientation != wxVERTICAL ) ? *new wxBoxSizer( orientation ) : m_StaticBoxSizer )
+	m_MasterSizer( *new wxBoxSizer( wxVERTICAL ) ),
+	ThisToggle( *new wxCheckBox( this, id, title, wxPoint( 8, 0 ) ) ),
+	ThisSizer( *new wxStaticBoxSizer( orientation, this ) )
 {
-	// Note on initializers above: Spacer required!
-	// The checkbox uses more room than a standard group box label, so we need to insert some space
-	// between the top of the groupbox and the first item.  If the user is wanting a horizontal sizer
-	// then we'll need to create a vertical sizer to act as a container for the spacer:
-
-	ThisToggle.SetSize( ThisToggle.GetSize() + wxSize( 8, 0 ) );
-
-	m_StaticBoxSizer.AddSpacer( 7 );
-	SetSizer( &m_StaticBoxSizer );
-
-	if( &ThisSizer != &m_StaticBoxSizer )
-		m_StaticBoxSizer.Add( &ThisSizer );
+	m_MasterSizer.Add( &ThisToggle );
+	m_MasterSizer.Add( &ThisSizer, wxSizerFlags().Expand() );
 
 	// Ensure that the right-side of the static group box isn't too cozy:
-	m_StaticBoxSizer.SetMinSize( ThisToggle.GetSize() + wxSize( 22, 1 ) );
+	m_MasterSizer.SetMinSize( ThisToggle.GetSize() + wxSize( 32, 0 ) );
 
-	Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CheckedStaticBox::MainToggle_Click ) );
+	SetSizer( &m_MasterSizer );
+
+	Connect( id, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CheckedStaticBox::MainToggle_Click ) );
 }
 
 // Adds a checkbox to this group panel's base sizer.
@@ -54,10 +46,6 @@ wxCheckBox& CheckedStaticBox::AddCheckBox( const wxString& label, wxWindowID id
 
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-/*BEGIN_EVENT_TABLE(CheckedStaticBox, wxPanel)
-	EVT_CHECKBOX(wxID_ANY, MainToggle_Click)
-END_EVENT_TABLE()*/
-
 void CheckedStaticBox::MainToggle_Click( wxCommandEvent& evt )
 {
 	SetValue( evt.IsChecked() );
diff --git a/pcsx2/NewGUI/CheckedStaticBox.h b/pcsx2/NewGUI/CheckedStaticBox.h
index 0f29b72ecd..e674bee9a7 100644
--- a/pcsx2/NewGUI/CheckedStaticBox.h
+++ b/pcsx2/NewGUI/CheckedStaticBox.h
@@ -23,7 +23,7 @@
 class CheckedStaticBox : public wxPanel
 {
 protected:
-	wxStaticBoxSizer& m_StaticBoxSizer;
+	wxBoxSizer& m_MasterSizer;
 
 public:
 	wxBoxSizer& ThisSizer;		// Boxsizer which holds all child items.
@@ -37,9 +37,6 @@ public:
 
 	wxCheckBox& AddCheckBox( const wxString& label, wxWindowID id=wxID_ANY );
 
-protected:
-	//DECLARE_EVENT_TABLE();
-
 public:
 	// Event handler for click events for the main checkbox (default behavior: enables/disables all child controls)
 	// This function can be overridden to implement custom handling of check enable/disable behavior.
diff --git a/pcsx2/NewGUI/LogOptionsDialog.cpp b/pcsx2/NewGUI/LogOptionsDialog.cpp
index 0bee779bcd..a36eab56f1 100644
--- a/pcsx2/NewGUI/LogOptionsDialog.cpp
+++ b/pcsx2/NewGUI/LogOptionsDialog.cpp
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
- 
+
 #include "PrecompiledHeader.h"
 #include "DebugTools/Debug.h"
 #include "LogOptionsDialog.h"
@@ -128,11 +128,15 @@ LogOptionsDialog::LogOptionsDialog(wxWindow* parent, int id, const wxPoint& pos,
 	wxBoxSizer& mainsizer = *new wxBoxSizer( wxVERTICAL );
 	wxBoxSizer& topSizer = *new wxBoxSizer( wxHORIZONTAL );
 
-	topSizer.Add( &eeBox, stdSpacingFlags );
-	topSizer.Add( &iopSizer, stdSpacingFlags );
+	// Expand comments below are form an attempt of mine to make the dialog box resiable, but it
+	// only wanted to work right for the miscSizer and I couldn't figure out why the CheckStaticBox
+	// panel wouldn't also resize to fit the window.. :(  -- air
 
-	mainsizer.Add( &topSizer );		// topsizer has it's own padding.
-	mainsizer.Add( &miscSizer, stdSpacingFlags );
+	topSizer.Add( &eeBox, stdSpacingFlags ); //.Expand() );
+	topSizer.Add( &iopSizer, stdSpacingFlags ); //.Expand() );
+
+	mainsizer.Add( &topSizer ); //, wxSizerFlags().Expand() );		// topsizer has it's own padding.
+	mainsizer.Add( &miscSizer, stdSpacingFlags ); //.Expand() );
 
 	AddOkCancel( mainsizer );
 
@@ -152,7 +156,7 @@ void LogOptionsDialog::LogChecked(wxCommandEvent &evt)
 	{
 		// [TODO] : Implement me!
 	}
-	
+
 	evt.Skip();
 }
 
diff --git a/pcsx2/NewGUI/wxHelpers.cpp b/pcsx2/NewGUI/wxHelpers.cpp
index cc070f0c00..c4d287120a 100644
--- a/pcsx2/NewGUI/wxHelpers.cpp
+++ b/pcsx2/NewGUI/wxHelpers.cpp
@@ -31,7 +31,7 @@ namespace wxHelpers
 	wxSizerFlags stdSpacingFlags( wxSizerFlags().Border( wxALL, 6 ) );
 	wxSizerFlags stdButtonSizerFlags( wxSizerFlags().Align(wxALIGN_RIGHT).Border() );
 	wxSizerFlags CheckboxFlags( wxSizerFlags().Border( wxALL, 6 ).Expand() );
-	
+
 	wxCheckBox& AddCheckBoxTo( wxWindow* parent, wxBoxSizer& sizer, const wxString& label, wxWindowID id )
 	{
 		wxCheckBox* retval = new wxCheckBox( parent, id, label );
@@ -43,11 +43,16 @@ namespace wxHelpers
 //////////////////////////////////////////////////////////////////////////////////////////
 //
 wxDialogWithHelpers::wxDialogWithHelpers( wxWindow* parent, int id,  const wxString& title, bool hasContextHelp, const wxPoint& pos, const wxSize& size ) :
-	wxDialog( parent, id, title, pos, size ),
+	wxDialog( parent, id, title, pos, size ), //, (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX | wxRESIZE_BORDER) ),	// flags for resizable dialogs, currently unused.
 	m_hasContextHelp( hasContextHelp )
 {
 	if( hasContextHelp )
 		wxHelpProvider::Set( new wxSimpleHelpProvider() );
+
+	// Note: currently the Close (X) button doesn't appear to work in dialogs.  Docs indicate
+	// that is should so I presume the problem is in wxWidgets and that (hopefully!) an updated
+	// version will fix it later.  I treid to fix it using a manual Connect but it didn't do
+	// any good.
 }
 
 wxCheckBox& wxDialogWithHelpers::AddCheckBox( wxBoxSizer& sizer, const wxString& label, wxWindowID id )
@@ -65,9 +70,11 @@ void wxDialogWithHelpers::AddOkCancel( wxBoxSizer &sizer )
 		SetExtraStyle( wxDIALOG_EX_CONTEXTHELP );
 
 #ifndef __WXMSW__
-		// create a sizer to hold the help and ok/cancel buttons.
+		// create a sizer to hold the help and ok/cancel buttons, for platforms
+		// that need a custom help icon.  [fixme: help icon prolly better off somewhere else]
 		buttonSizer = new wxBoxSizer( wxHORIZONTAL );
 		buttonSizer->Add( new wxContextHelpButton(this), wxHelpers::stdButtonSizerFlags.Align( wxALIGN_LEFT ) );
+		sizer.Add( buttonSizer, wxSizerFlags().Center() );
 #endif
 	}
 	buttonSizer->Add( CreateStdDialogButtonSizer( wxOK | wxCANCEL ), wxHelpers::stdButtonSizerFlags );
diff --git a/pcsx2/NewGUI/wxHelpers.h b/pcsx2/NewGUI/wxHelpers.h
index b74f997188..ab3f56c7c6 100644
--- a/pcsx2/NewGUI/wxHelpers.h
+++ b/pcsx2/NewGUI/wxHelpers.h
@@ -15,7 +15,7 @@ namespace wxHelpers
 	// users always expect it to be.  Most likely Mac platforms expect it on the left side
 	// just because it's *not* where win32 sticks it.  Too bad!
 	extern wxSizerFlags stdButtonSizerFlags;
-	
+
 	extern wxSizerFlags CheckboxFlags;
 }
 
@@ -25,12 +25,12 @@ class wxDialogWithHelpers : public wxDialog
 {
 protected:
 	bool m_hasContextHelp;
-	
+
 public:
 	wxDialogWithHelpers(wxWindow* parent, int id, const wxString& title, bool hasContextHelp, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize );
 
 protected:
 	wxCheckBox& AddCheckBox( wxBoxSizer& sizer, const wxString& label, wxWindowID id=wxID_ANY );
 	void AddOkCancel( wxBoxSizer& sizer );
-	
+
 };
diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h
index b8af0b6936..de0a1b8131 100644
--- a/pcsx2/PrecompiledHeader.h
+++ b/pcsx2/PrecompiledHeader.h
@@ -1,4 +1,7 @@
-#pragma once
+#ifndef PCSX2_PRECOMPILED_HEADER
+#define PCSX2_PRECOMPILED_HEADER
+
+//#pragma once
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Microsoft specific STL extensions for bounds checking and stuff: Enabled in devbuilds,
@@ -15,11 +18,6 @@
 
 #define NOMINMAX		// Disables other libs inclusion of their own min/max macros (we use std instead)
 
-// __LINUX__ defined in wxWidgets.
-//#if defined (__linux__)  // some distributions are lower case
-//#	define __LINUX__
-//#endif
-
 #ifdef _WIN32
 // disable warning C4244: '=' : conversion from 'big' to 'small', possible loss of data
 #	pragma warning(disable:4244)
@@ -184,3 +182,5 @@ static __forceinline u32 timeGetTime()
 	static const bool IsDebugBuild = false;
 
 #endif
+
+#endif
diff --git a/pcsx2/SafeArray.h b/pcsx2/SafeArray.h
index 5ecabaa337..25ab0ac724 100644
--- a/pcsx2/SafeArray.h
+++ b/pcsx2/SafeArray.h
@@ -16,8 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef __SAFEARRAY_H__
-#define __SAFEARRAY_H__
+#pragma once
 
 extern void* __fastcall pcsx2_aligned_malloc(size_t size, size_t align);
 extern void* __fastcall pcsx2_aligned_realloc(void* handle, size_t size, size_t align);
@@ -75,7 +74,7 @@ class SafeArray : public NoncopyableObject
 public:
 	static const int DefaultChunkSize = 0x1000 * sizeof(T);
 
-public: 
+public:
 	const wxString Name;		// user-assigned block name
 	int ChunkSize;
 
@@ -90,7 +89,7 @@ protected:
 	// use its own memory allocation (with an aligned memory, for example).
 	// Throws:
 	//   Exception::OutOfMemory if the allocated_mem pointer is NULL.
-	explicit SafeArray( const wxString& name, T* allocated_mem, int initSize ) : 
+	explicit SafeArray( const wxString& name, T* allocated_mem, int initSize ) :
 		Name( name )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( allocated_mem )
@@ -111,7 +110,7 @@ public:
 		safe_free( m_ptr );
 	}
 
-	explicit SafeArray( const wxString& name=wxT("Unnamed") ) : 
+	explicit SafeArray( const wxString& name=wxT("Unnamed") ) :
 		Name( name )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( NULL )
@@ -119,7 +118,7 @@ public:
 	{
 	}
 
-	explicit SafeArray( const char* name ) : 
+	explicit SafeArray( const char* name ) :
 		Name( wxString::FromAscii(name) )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( NULL )
@@ -127,7 +126,7 @@ public:
 	{
 	}
 
-	explicit SafeArray( int initialSize, const wxString& name=wxT("Unnamed") ) : 
+	explicit SafeArray( int initialSize, const wxString& name=wxT("Unnamed") ) :
 		Name( name )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( (T*)malloc( initialSize * sizeof(T) ) )
@@ -137,7 +136,7 @@ public:
 			throw Exception::OutOfMemory();
 	}
 
-	explicit SafeArray( int initialSize, const char* name ) : 
+	explicit SafeArray( int initialSize, const char* name ) :
 		Name( wxString::FromAscii(name) )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( (T*)malloc( initialSize * sizeof(T) ) )
@@ -218,7 +217,7 @@ class SafeList
 public:
 	static const int DefaultChunkSize = 0x80 * sizeof(T);
 
-public: 
+public:
 	const wxString Name;		// user-assigned block name
 	int ChunkSize;				// assigned DefaultChunkSize on init, reconfigurable at any time.
 
@@ -234,19 +233,19 @@ protected:
 	{
 		return (T*)realloc( m_ptr, newsize * sizeof(T) );
 	}
-	
+
 	void _boundsCheck( uint i ) const
 	{
 		if( IsDevBuild && i >= (uint)m_length )
 			throw Exception::IndexBoundsFault( Name, i, m_length );
 	}
 
-public:	
+public:
 	virtual ~SafeList()
 	{
 	}
 
-	explicit SafeList( const wxString& name=wxT("Unnamed") ) : 
+	explicit SafeList( const wxString& name=wxT("Unnamed") ) :
 		Name( name )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( NULL )
@@ -255,7 +254,7 @@ public:
 	{
 	}
 
-	explicit SafeList( const char* name ) : 
+	explicit SafeList( const char* name ) :
 		Name( wxString::FromAscii(name) )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( NULL )
@@ -264,7 +263,7 @@ public:
 	{
 	}
 
-	explicit SafeList( int initialSize, const wxString& name=wxT("Unnamed") ) : 
+	explicit SafeList( int initialSize, const wxString& name=wxT("Unnamed") ) :
 		Name( name )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( (T*)malloc( initialSize * sizeof(T) ) )
@@ -275,7 +274,7 @@ public:
 			throw Exception::OutOfMemory();
 	}
 
-	explicit SafeList( int initialSize, const char* name ) : 
+	explicit SafeList( int initialSize, const char* name ) :
 		Name( wxString::FromAscii(name) )
 	,	ChunkSize( DefaultChunkSize )
 	,	m_ptr( (T*)malloc( initialSize * sizeof(T) ) )
@@ -309,7 +308,7 @@ public:
 					wxsFormat(
 						wxT("Out-of-memory on SafeList block re-allocation.\n")
 						wxT("Old size: %d bytes, New size: %d bytes"),
-						m_allocsize, newalloc 
+						m_allocsize, newalloc
 					)
 				);
 			}
@@ -321,14 +320,14 @@ public:
 	// DevBuilds : Throws Exception::IndexBoundsFault() if the index is invalid.
 	T& operator[]( int idx ) { return *_getPtr( (uint)idx ); }
 	const T& operator[]( int idx ) const { return *_getPtr( (uint)idx ); }
-	
+
 	int Add( const T& src )
 	{
 		MakeRoomFor( m_length + 1 );
 		m_ptr[m_length] = src;
 		return m_length++;
 	}
-	
+
 	// Performs a standard array-copy removal of the given item.  All items past the
 	// given item are copied over.  Throws Exception::IndexBoundsFault() if the index
 	// is invalid (devbuilds only)
@@ -392,30 +391,30 @@ public:
 		// mptr is set to null, so the parent class's destructor won't re-free it.
 	}
 
-	explicit SafeAlignedArray( const wxString& name=wxT("Unnamed") ) : 
+	explicit SafeAlignedArray( const wxString& name=wxT("Unnamed") ) :
 		SafeArray<T>::SafeArray( name )
 	{
 	}
 
-	explicit SafeAlignedArray( const char* name ) : 
+	explicit SafeAlignedArray( const char* name ) :
 		SafeArray<T>::SafeArray( name )
 	{
 	}
 
-	explicit SafeAlignedArray( int initialSize, const wxString& name=wxT("Unnamed") ) : 
+	explicit SafeAlignedArray( int initialSize, const wxString& name=wxT("Unnamed") ) :
 		SafeArray<T>::SafeArray(
 			_getName(name),
 			(T*)_aligned_malloc( initialSize * sizeof(T), Alignment ),
-			initialSize 
+			initialSize
 		)
 	{
 	}
 
-	explicit SafeAlignedArray( int initialSize, const char* name ) : 
+	explicit SafeAlignedArray( int initialSize, const char* name ) :
 		SafeArray<T>::SafeArray(
 			_getName(wxString::FromAscii(name)),
 			(T*)_aligned_malloc( initialSize * sizeof(T), Alignment ),
-			initialSize 
+			initialSize
 		)
 	{
 	}
@@ -432,5 +431,3 @@ public:
 // For lack of a better place for now (they depend on SafeList so they can't go in StringUtil)
 extern void SplitString( SafeList<wxString>& dest, const wxString& src, const wxString& delims );
 extern void JoinString( wxString& dest, const SafeList<wxString>& src, const wxString& separator );
-
-#endif
diff --git a/pcsx2/System.h b/pcsx2/System.h
index 736c9b5e2b..cb3cc4ebb5 100644
--- a/pcsx2/System.h
+++ b/pcsx2/System.h
@@ -16,10 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef __SYSTEM_H__
-#define __SYSTEM_H__
+#pragma once
 
-#include "PS2Etypes.h"
 #include "Pcsx2Config.h"
 #include "SafeArray.h"
 #include "Misc.h"
@@ -47,7 +45,7 @@ namespace HostSys
 	extern void Munmap(uptr base, u32 size);
 
 	extern void MemProtect( void* baseaddr, size_t size, PageProtectionMode mode, bool allowExecution=false );
-	
+
 	static __forceinline void Munmap( void* base, u32 size )
 	{
 		Munmap( (uptr)base, size );
@@ -76,7 +74,7 @@ extern void SysPrepareExecution( const wxString& elf_file, bool use_bios=false )
 extern void SysExecute();
 
 
-// Maps a block of memory for use as a recompiled code buffer, and ensures that the 
+// Maps a block of memory for use as a recompiled code buffer, and ensures that the
 // allocation is below a certain memory address (specified in "bounds" parameter).
 // The allocated block has code execution privileges.
 // Returns NULL on allocation failure.
@@ -201,5 +199,3 @@ using Console::Color_Magenta;
 using Console::Color_Cyan;
 using Console::Color_Yellow;
 using Console::Color_White;
-
-#endif /* __SYSTEM_H__ */
diff --git a/pcsx2/windows/SamplProf.cpp b/pcsx2/windows/SamplProf.cpp
index e75a430fdf..eb9d17062b 100644
--- a/pcsx2/windows/SamplProf.cpp
+++ b/pcsx2/windows/SamplProf.cpp
@@ -1,5 +1,6 @@
 
-#include "Win32.h"
+#include "PrecompiledHeader.h"
+#include "RedtapeWindows.h"
 
 #include "SamplProf.h"
 #include <map>
diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
index 82212c5d71..e49597ac23 100644
--- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
+++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
@@ -270,410 +270,6 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="OldGUI"
-			>
-			<File
-				RelativePath="..\AdvancedDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ConfigDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CpuDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ini.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\McdConfigDlg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\PatchBrowser.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\WindowsPCH.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\WinSysExec.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="Debugger"
-				>
-				<File
-					RelativePath=".\..\Debugger.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\..\Debugger.h"
-					>
-				</File>
-				<File
-					RelativePath=".\..\DebugMemory.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\..\Debugreg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PrecompiledHeaderThrough="Win32.h"
-							PrecompiledHeaderFile="$(IntDir)\Win32.pch"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="Resources"
-				>
-				<File
-					RelativePath="..\Cdrom02.ico"
-					>
-				</File>
-				<File
-					RelativePath="..\debugger.rc"
-					>
-				</File>
-				<File
-					RelativePath="..\pcsx2.rc"
-					>
-				</File>
-				<File
-					RelativePath="..\..\pcsxAbout.bmp"
-					>
-				</File>
-				<File
-					RelativePath="..\ps2_silver.bmp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Include"
-				>
-				<File
-					RelativePath="..\..\HostGui.h"
-					>
-				</File>
-				<File
-					RelativePath="..\McdsDlg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\resource.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Win32.h"
-					>
-				</File>
-				<File
-					RelativePath="..\WinDebugResource.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
 		<Filter
 			Name="Elf"
 			>
@@ -792,24 +388,6 @@
 			<File
 				RelativePath="..\WinMisc.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
 			</File>
 			<Filter
 				Name="TinyXML"
@@ -1151,315 +729,7 @@
 				Name="Linux"
 				>
 				<File
-					RelativePath="..\..\Linux\AboutDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\AdvancedDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\ConfigDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\CpuDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\DebugDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\HacksDlg.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxConsole.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxMain.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxMisc.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxSysExec.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\LnxThreads.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Devel|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\Linux\Pref.cpp"
+					RelativePath="..\..\Linux\HostGui.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1517,22 +787,6 @@
 				<Filter
 					Name="Include"
 					>
-					<File
-						RelativePath="..\..\Linux\ConfigDlg.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\Linux\DebugDlg.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\Linux\LnxMain.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\Linux\LnxSysExec.h"
-						>
-					</File>
 					<File
 						RelativePath="..\..\Linux\memzero.h"
 						>
@@ -2919,33 +2173,6 @@
 			<File
 				RelativePath="..\SamplProf.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\Saveslots.cpp"
@@ -2997,33 +2224,6 @@
 			<File
 				RelativePath="..\WinThreads.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Devel|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PrecompiledHeaderThrough="Win32.h"
-						PrecompiledHeaderFile="$(IntDir)\win32.pch"
-					/>
-				</FileConfiguration>
 			</File>
 			<Filter
 				Name="Include"
@@ -3032,6 +2232,10 @@
 					RelativePath="..\..\Exceptions.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\HostGui.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\MemcpyFast.h"
 					>
@@ -3071,7 +2275,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Dynarec Emitter"
+			Name="x86Emitter"
 			>
 			<File
 				RelativePath="..\..\x86\ix86\ix86.cpp"
diff --git a/pcsx2/windows/Win32.h b/pcsx2/windows/Win32.h
index b5f7401dc4..fc9e629844 100644
--- a/pcsx2/windows/Win32.h
+++ b/pcsx2/windows/Win32.h
@@ -16,8 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef _PCSX2_WIN32_H__
-#define _PCSX2_WIN32_H__
+#pragma once
 
 #include "RedtapeWindows.h"		// our "safe" include of windows (sets version and undefs uselessness)
 #include <commctrl.h>
@@ -171,5 +170,3 @@ extern bool StreamException_LogLastError( const wxString& streamname, const wxCh
 // to already decompressed files).
 extern void NTFS_CompressFile( const wxString& file, bool compressStatus=true );
 
-#endif
-
diff --git a/pcsx2/windows/WinMisc.cpp b/pcsx2/windows/WinMisc.cpp
index 953d22b661..94ab3b6fe2 100644
--- a/pcsx2/windows/WinMisc.cpp
+++ b/pcsx2/windows/WinMisc.cpp
@@ -16,7 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
  
-#include "Win32.h"
+#include "PrecompiledHeader.h"
+#include "RedtapeWindows.h"
 #include "cdvd.h"
 
 static LARGE_INTEGER lfreq;
diff --git a/pcsx2/windows/WinThreads.cpp b/pcsx2/windows/WinThreads.cpp
index 658aab7a0a..d70781412a 100644
--- a/pcsx2/windows/WinThreads.cpp
+++ b/pcsx2/windows/WinThreads.cpp
@@ -17,7 +17,8 @@
  */
 
 
-#include "Win32.h"
+#include "PrecompiledHeader.h"
+#include "RedtapeWindows.h"
 
 #include "System.h"
 #include "ix86/ix86_types.h"
diff --git a/pcsx2/x86/ix86/ix86.h b/pcsx2/x86/ix86/ix86.h
index 502cfcded9..c2b0eaf7d7 100644
--- a/pcsx2/x86/ix86/ix86.h
+++ b/pcsx2/x86/ix86/ix86.h
@@ -5,12 +5,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 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, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA