diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 94b5ab74e6..3faa27d0a0 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -17,8 +17,11 @@
 // Contributor(s):
 //
 
-#include "stdwx.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "BOINCGUIApp.h"
+#endif
 
+#include "stdwx.h"
 #include "BOINCGUIApp.h"
 #include "MainFrame.h"
 #include "MainDocument.h"
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index ea45503a49..7f560f67e2 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -17,7 +17,13 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _BOINCGUIAPP_H_
+#define _BOINCGUIAPP_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "BOINCGUIApp.cpp"
+#endif
+
 
 #include "MainFrame.h"
 #include "MainDocument.h"
@@ -30,11 +36,9 @@ class CBOINCGUIApp : public wxApp
     typedef wxApp Inherited;
 
 protected:
-    int OnExit();
+    int             OnExit();
 
-    /// Called by wxWindows to initialize command line handling.
     void            OnInitCmdLine(wxCmdLineParser &parser);
-    /// Called by wxWindows to allow CboincguiApp to handle the command line.
     bool            OnCmdLineParsed(wxCmdLineParser &parser);
 
     CMainFrame*     m_pFrame;
@@ -51,3 +55,6 @@ public:
 
 
 DECLARE_APP(CBOINCGUIApp)
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/BaseListCtrlView.cpp b/clientgui/BaseListCtrlView.cpp
index e757d2731f..0e79aaf3f5 100644
--- a/clientgui/BaseListCtrlView.cpp
+++ b/clientgui/BaseListCtrlView.cpp
@@ -17,10 +17,9 @@
 // Contributor(s):
 //
 
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "BaseListCtrlView.h"
+#endif
 
 #include "stdwx.h"
 #include "BaseListCtrlView.h"
diff --git a/clientgui/BaseListCtrlView.h b/clientgui/BaseListCtrlView.h
index 98ba12885f..4625885bcd 100644
--- a/clientgui/BaseListCtrlView.h
+++ b/clientgui/BaseListCtrlView.h
@@ -17,7 +17,13 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _BASELISTCTRLVIEW_H_
+#define _BASELISTCTRLVIEW_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "BaseListCtrlView.cpp"
+#endif
+
 
 class CBaseListCtrlView : public wxListCtrl
 {
@@ -31,3 +37,6 @@ public:
 
     virtual wxString GetViewName(void);
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/BaseWindowView.cpp b/clientgui/BaseWindowView.cpp
index 83025b09fa..cc68d5c87c 100644
--- a/clientgui/BaseWindowView.cpp
+++ b/clientgui/BaseWindowView.cpp
@@ -17,10 +17,9 @@
 // Contributor(s):
 //
 
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "BaseWindowView.h"
+#endif
 
 #include "stdwx.h"
 #include "BaseWindowView.h"
diff --git a/clientgui/BaseWindowView.h b/clientgui/BaseWindowView.h
index 73fd92f9f7..0ebd61786a 100644
--- a/clientgui/BaseWindowView.h
+++ b/clientgui/BaseWindowView.h
@@ -17,7 +17,13 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _BASEWINDOWVIEW_H_
+#define _BASEWINDOWVIEW_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "BaseWindowView.cpp"
+#endif
+
 
 class CBaseWindowView : public wxPanel
 {
@@ -31,3 +37,6 @@ public:
 
     virtual wxString GetViewName(void);
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/Events.h b/clientgui/Events.h
index 732d0182a1..05b74d001e 100644
--- a/clientgui/Events.h
+++ b/clientgui/Events.h
@@ -17,10 +17,15 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _EVENTS_H_
+#define _EVENTS_H_
+
 
 enum {
     ID_STATUSBAR = wxID_HIGHEST + 1,
+    ID_COMMANDSATTACHPROJECT,
     ID_TOOLSOPTIONS
 } enumEvents;
 
+
+#endif
\ No newline at end of file
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 5223199dff..39c6455ce1 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "MainDocument.h"
+#endif
+
 #include "stdwx.h"
 #include "MainDocument.h"
 
diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h
index 1e873f5b76..bef6274162 100644
--- a/clientgui/MainDocument.h
+++ b/clientgui/MainDocument.h
@@ -17,7 +17,13 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _MAINDOCUMENT_H_
+#define _MAINDOCUMENT_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "MainDocument.cpp"
+#endif
+
 
 class CMainDocument : public wxObject
 {
@@ -27,3 +33,6 @@ public:
     CMainDocument(void);
     ~CMainDocument(void);
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index ed4abe4c04..5e66710f7d 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "MainFrame.h"
+#endif
+
 #include "stdwx.h"
 #include "BOINCGUIApp.h"
 #include "MainFrame.h"
diff --git a/clientgui/MainFrame.h b/clientgui/MainFrame.h
index c44def918c..97f995ab4b 100644
--- a/clientgui/MainFrame.h
+++ b/clientgui/MainFrame.h
@@ -17,7 +17,13 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _MAINFRAME_H_
+#define _MAINFRAME_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "MainFrame.cpp"
+#endif
+
 
 class CMainFrame : public wxFrame
 {
@@ -63,3 +69,6 @@ private:
 
     DECLARE_EVENT_TABLE()
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/MessagesView.cpp b/clientgui/MessagesView.cpp
index fa8551c6ad..962df21627 100644
--- a/clientgui/MessagesView.cpp
+++ b/clientgui/MessagesView.cpp
@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "MessagesView.h"
+#endif
+
 #include "stdwx.h"
 #include "MessagesView.h"
 
diff --git a/clientgui/MessagesView.h b/clientgui/MessagesView.h
index 78fc89d7a6..f7529278cb 100644
--- a/clientgui/MessagesView.h
+++ b/clientgui/MessagesView.h
@@ -17,7 +17,14 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _MESSAGESVIEW_H_
+#define _MESSAGESVIEW_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "MessagesView.cpp"
+#endif
+
+
 #include "BaseListCtrlView.h"
 
 class CMessagesView : public CBaseListCtrlView
@@ -32,3 +39,6 @@ public:
 
     virtual wxString GetViewName(void);
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/ProjectsView.cpp b/clientgui/ProjectsView.cpp
index 36c51ac99d..30459b7ec0 100644
--- a/clientgui/ProjectsView.cpp
+++ b/clientgui/ProjectsView.cpp
@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "ProjectsView.h"
+#endif
+
 #include "stdwx.h"
 #include "ProjectsView.h"
 
diff --git a/clientgui/ProjectsView.h b/clientgui/ProjectsView.h
index fcd2cf2ea4..ee02ec0916 100644
--- a/clientgui/ProjectsView.h
+++ b/clientgui/ProjectsView.h
@@ -17,7 +17,14 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _PROJECTSVIEW_H_
+#define _PROJECTSVIEW_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "ProjectsView.cpp"
+#endif
+
+
 #include "BaseListCtrlView.h"
 
 class CProjectsView : public CBaseListCtrlView
@@ -32,3 +39,6 @@ public:
 
     virtual wxString GetViewName(void);
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/ResourceUtilizationView.cpp b/clientgui/ResourceUtilizationView.cpp
index 9ccc93dce7..f0a5aa143e 100644
--- a/clientgui/ResourceUtilizationView.cpp
+++ b/clientgui/ResourceUtilizationView.cpp
@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "ResourceUtilizationView.h"
+#endif
+
 #include "stdwx.h"
 #include "ResourceUtilizationView.h"
 
diff --git a/clientgui/ResourceUtilizationView.h b/clientgui/ResourceUtilizationView.h
index f5fa7f39f6..c7837054e6 100644
--- a/clientgui/ResourceUtilizationView.h
+++ b/clientgui/ResourceUtilizationView.h
@@ -17,7 +17,14 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _RESOURCEUTILIZATIONVIEW_H_
+#define _RESOURCEUTILIZATIONVIEW_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "ResourceUtilizationView.cpp"
+#endif
+
+
 #include "BaseWindowView.h"
 
 class CResourceUtilizationView : public CBaseWindowView
@@ -32,3 +39,6 @@ public:
 
     virtual wxString GetViewName(void);
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/TransfersView.cpp b/clientgui/TransfersView.cpp
index f0cc5e7d8b..0d6f1137e4 100644
--- a/clientgui/TransfersView.cpp
+++ b/clientgui/TransfersView.cpp
@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "TransfersView.h"
+#endif
+
 #include "stdwx.h"
 #include "TransfersView.h"
 
diff --git a/clientgui/TransfersView.h b/clientgui/TransfersView.h
index 31e8aadc89..f33f953fef 100644
--- a/clientgui/TransfersView.h
+++ b/clientgui/TransfersView.h
@@ -17,7 +17,14 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _TRANSFERSVIEW_H_
+#define _TRANSFERSVIEW_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "TransfersView.cpp"
+#endif
+
+
 #include "BaseListCtrlView.h"
 
 class CTransfersView : public CBaseListCtrlView
@@ -32,3 +39,6 @@ public:
 
     virtual wxString GetViewName(void);
 };
+
+
+#endif
\ No newline at end of file
diff --git a/clientgui/WorkView.cpp b/clientgui/WorkView.cpp
index 61722e75e3..14a03d76a9 100644
--- a/clientgui/WorkView.cpp
+++ b/clientgui/WorkView.cpp
@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "WorkView.h"
+#endif
+
 #include "stdwx.h"
 #include "WorkView.h"
 
diff --git a/clientgui/WorkView.h b/clientgui/WorkView.h
index b8b693cae7..d968c59fee 100644
--- a/clientgui/WorkView.h
+++ b/clientgui/WorkView.h
@@ -17,7 +17,14 @@
 // Contributor(s):
 //
 
-#pragma once
+#ifndef _WORKVIEW_H_
+#define _WORKVIEW_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "WorkView.cpp"
+#endif
+
+
 #include "BaseListCtrlView.h"
 
 class CWorkView : public CBaseListCtrlView
@@ -32,3 +39,6 @@ public:
 
     virtual wxString GetViewName(void);
 };
+
+
+#endif
\ No newline at end of file