diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index 6801f9b12..945d54e27 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -76,7 +76,7 @@ win32-x-g++ {
 		LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
 		LIBS += -lole32 -lwinmm
 
-		DEFINES *= WIN32 WIN32_CROSS_UBUNTU
+		DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
 
 		INCLUDEPATH += ../../../../gpgme-1.1.8/src/
 		INCLUDEPATH += ../../../../libgpg-error-1.7/src/
@@ -101,6 +101,8 @@ win32 {
     LIBS += -lole32 -lwinmm
     RC_FILE = gui/images/retroshare_win.rc
 
+    DEFINES += WINDOWS_SYS
+
     GPG_ERROR_DIR = ../../../../libgpg-error-1.7
     GPGME_DIR  = ../../../../gpgme-1.1.8
     INCLUDEPATH += . $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
diff --git a/retroshare-gui/src/idle/idle_mac.cpp b/retroshare-gui/src/idle/idle_mac.cpp
deleted file mode 100644
index e54ccbb5d..000000000
--- a/retroshare-gui/src/idle/idle_mac.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * idle_mac.cpp - detect desktop idle time
- * Copyright (C) 2003  Tarkvara Design Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#include "idle.h"
-#include <Carbon/Carbon.h>
-
-
-// Why does Apple have to make this so complicated?
-static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) {
-	OSStatus  err;
-	FSRef   frameworksFolderRef;
-	CFURLRef baseURL;
-	CFURLRef bundleURL;
- 
-	if ( bundlePtr == nil ) return( -1 );
- 
-	*bundlePtr = nil;
- 
-	baseURL = nil;
-	bundleURL = nil;
- 
-	err = FSFindFolder(kOnAppropriateDisk, kFrameworksFolderType, true, &frameworksFolderRef);
-	if (err == noErr) {
-		baseURL = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &frameworksFolderRef);
-		if (baseURL == nil) {
-			err = coreFoundationUnknownErr;
-		}
-	}
-	if (err == noErr) {
-		bundleURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, baseURL, framework, false);
-		if (bundleURL == nil) {
-			err = coreFoundationUnknownErr;
-		}
-	}
-	if (err == noErr) {
-		*bundlePtr = CFBundleCreate(kCFAllocatorSystemDefault, bundleURL);
-		if (*bundlePtr == nil) {
-			err = coreFoundationUnknownErr;
-		}
-	}
-	if (err == noErr) {
-		if ( ! CFBundleLoadExecutable( *bundlePtr ) ) {
-			err = coreFoundationUnknownErr;
-		}
-	}
-
-	// Clean up.
-	if (err != noErr && *bundlePtr != nil) {
-		CFRelease(*bundlePtr);
-		*bundlePtr = nil;
-	}
-	if (bundleURL != nil) {
-		CFRelease(bundleURL);
-	} 
-	if (baseURL != nil) {
-		CFRelease(baseURL);
-	} 
-
-	return err;
-}
-
-
-class IdlePlatform::Private {
-public:
-	EventLoopTimerRef mTimerRef;
-	int mSecondsIdle;
-
-	Private() : mTimerRef(0), mSecondsIdle(0) {}
-
-	static pascal void IdleTimerAction(EventLoopTimerRef, EventLoopIdleTimerMessage inState, void* inUserData);
-
-};
-
-
-pascal void IdlePlatform::Private::IdleTimerAction(EventLoopTimerRef, EventLoopIdleTimerMessage inState, void* inUserData) {
-	switch (inState) {
-		case kEventLoopIdleTimerStarted:
-		case kEventLoopIdleTimerStopped:
-    		// Get invoked with this constant at the start of the idle period,
-			// or whenever user activity cancels the idle.
-		   ((IdlePlatform::Private*)inUserData)->mSecondsIdle = 0;
-			break;
-		case kEventLoopIdleTimerIdling:
-			// Called every time the timer fires (i.e. every second).
-		   ((IdlePlatform::Private*)inUserData)->mSecondsIdle++;
-			break;
-	}
-}
-
-
-IdlePlatform::IdlePlatform() {
-	d = new Private();
-}
-
-IdlePlatform::~IdlePlatform() {
-	RemoveEventLoopTimer(d->mTimerRef);
-	delete d;
-}
-
-
-// Typedef for the function we're getting back from CFBundleGetFunctionPointerForName.
-typedef OSStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop,
-																 EventTimerInterval   inFireDelay,
-																 EventTimerInterval   inInterval,
-																 EventLoopIdleTimerUPP    inTimerProc,
-																 void *               inTimerData,
-																 EventLoopTimerRef *  outTimer);
-
-
-bool IdlePlatform::init() {
-	// May already be init'ed.
-	if (d->mTimerRef) {
-		return true;
-	}
-
-	// According to the docs, InstallEventLoopIdleTimer is new in 10.2.
-	// According to the headers, it has been around since 10.0.
-	// One of them is lying.  We'll play it safe and weak-link the function.
-
-	// Load the "Carbon.framework" bundle.
-	CFBundleRef carbonBundle;
-	if (LoadFrameworkBundle( CFSTR("Carbon.framework"), &carbonBundle ) != noErr) {
-		return false;
-	}
- 
-	// Load the Mach-O function pointers for the routine we will be using.
-	InstallEventLoopIdleTimerPtr myInstallEventLoopIdleTimer = (InstallEventLoopIdleTimerPtr)CFBundleGetFunctionPointerForName(carbonBundle, CFSTR("InstallEventLoopIdleTimer"));
-	if (myInstallEventLoopIdleTimer == 0) {
-		return false;
-	}
-
-	EventLoopIdleTimerUPP timerUPP = NewEventLoopIdleTimerUPP(Private::IdleTimerAction);
-	if ((*myInstallEventLoopIdleTimer)(GetMainEventLoop(), kEventDurationSecond, kEventDurationSecond, timerUPP, 0, &d->mTimerRef)) {
-		return true;
-	}
-
-	return false;
-}
-
-
-int IdlePlatform::secondsIdle() {
-	return d->mSecondsIdle;
-}