diff --git a/Sources/Plasma/NucleusLib/inc/CMakeLists.txt b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt
index d252b6ca..696f360f 100644
--- a/Sources/Plasma/NucleusLib/inc/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt
@@ -1,5 +1,6 @@
 include_directories("../../CoreLib")
 include_directories("../../NucleusLib")
+include_directories("../../NucleusLib/inc")
 
 set(pnNucleusInc_HEADERS
     hsGMatState.h
diff --git a/Sources/Plasma/NucleusLib/pnInputCore/plKeyMap.h b/Sources/Plasma/NucleusLib/pnInputCore/plKeyMap.h
index bbb067c5..383adbc6 100644
--- a/Sources/Plasma/NucleusLib/pnInputCore/plKeyMap.h
+++ b/Sources/Plasma/NucleusLib/pnInputCore/plKeyMap.h
@@ -179,7 +179,7 @@ class plKeyMap : public plInputMap
         void FindAllBindingsByKey( const plKeyCombo &combo, hsTArray<const plKeyBinding*> &result ) const;
         
         // Searches for the binding by console command. Returns nil if not found
-        const plKeyBinding* plKeyMap::FindConsoleBinding( const char *command ) const;
+        const plKeyBinding* FindConsoleBinding( const char *command ) const;
 
         // Make sure the given keys are clear of bindings, i.e. not used
         void    EnsureKeysClear( const plKeyCombo &key1, const plKeyCombo &key2 );
diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
index 65f84143..c6256045 100644
--- a/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
+++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
@@ -119,7 +119,7 @@ class plFixedKeyValidator
     private:
         static plFixedKeyValidator  fValidator;
 
-        plFixedKeyValidator::plFixedKeyValidator()
+        plFixedKeyValidator()
         {
             // verify that each Seed is in the correct spot...via the enum...
             int i;
diff --git a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h
index f90976d1..b104d582 100644
--- a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h
+++ b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h
@@ -69,7 +69,7 @@ protected:
     void CreateNotifyMsg();
     
 public:
-    friend plVolumeSensorConditionalObjectNoArbitration;
+    friend class plVolumeSensorConditionalObjectNoArbitration;
     plLogicModBase();
     ~plLogicModBase();
     CLASSNAME_REGISTER( plLogicModBase );