diff --git a/Sources/Plasma/NucleusLib/pnInputCore/plOSMsg.h b/Sources/Plasma/NucleusLib/pnInputCore/plOSMsg.h
index 0ee37d41..11eda1f5 100644
--- a/Sources/Plasma/NucleusLib/pnInputCore/plOSMsg.h
+++ b/Sources/Plasma/NucleusLib/pnInputCore/plOSMsg.h
@@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 
 // for Win32:
+#ifdef HS_BUILD_FOR_WIN32
 
 enum plOSMsg
 {
@@ -71,6 +72,12 @@ enum plOSMsg
     CHAR_MSG        = WM_CHAR,
 };
 
+#else
+
+enum plOSMsg { };
+
+#endif
+
 
 //
 // generic structure that we can use to describe
diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp
index a775bc56..2da834f9 100644
--- a/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp
@@ -432,18 +432,18 @@ hsBool plVisLOSMgr::CursorCheck(plVisHit& hit)
 /////////////////////////////////////////////////////////////////
 
 static plSceneObject* marker = nil;
-static plPipeline* pipe = nil;
+static plPipeline* fPipe = nil;
 
 
 void VisLOSHackBegin(plPipeline* p, plSceneObject* m)
 {
     marker = m;
-    pipe = p;
+    fPipe = p;
 }
 
 void VisLOSHackPulse()
 {
-    if( !pipe )
+    if( !fPipe )
         return;
 
     plVisHit hit;
diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
index 97c9f1dd..c0cfe58c 100644
--- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
@@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "HeadSpin.h"
 #include "hsWindows.h"
+#include "hsWindowHndl.h"
 //#include "pnInputCore/plControlDefinition.h"
 #include "pnInputCore/plOSMsg.h"
 #include "pnInputCore/plKeyDef.h"
@@ -75,7 +76,7 @@ public:
     void SetFlags(UInt32 f) { fFlags = f; }
     virtual void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, hsBool bKeyRepeat, wchar_t c = nil) {;}
     virtual void HandleMouseEvent(plOSMsg message, plMouseState state)  {;}
-    virtual void HandleWindowActivate(bool bActive, HWND hWnd) {;}
+    virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd) {;}
     virtual hsBool MsgReceive(plMessage* msg) {return false;}
     virtual void Shutdown() {;}
 
@@ -116,7 +117,7 @@ public:
 
     const char* GetInputName() { return "keyboard"; }
     void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, hsBool bKeyRepeat, wchar_t c = nil);
-    virtual void HandleWindowActivate(bool bActive, HWND hWnd);
+    virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd);
     virtual hsBool IsCapsLockKeyOn();
     virtual void Shutdown();
 
@@ -159,7 +160,7 @@ public:
     ~plMouseDevice();
 
     const char* GetInputName() { return "mouse"; }
-    void HandleWindowActivate(bool bActive, HWND hWnd);
+    void HandleWindowActivate(bool bActive, hsWindowHndl hWnd);
 
     hsBool  HasControlFlag(int f) const { return fControlFlags.IsBitSet(f); }
     void    SetControlFlag(int f)