diff --git a/game/client/cdll_util.h b/game/client/cdll_util.h
index 7eb2d520..ab79c099 100644
--- a/game/client/cdll_util.h
+++ b/game/client/cdll_util.h
@@ -16,7 +16,7 @@
 #include <soundflags.h>
 #include "mathlib/vector.h"
 #include <shareddefs.h>
-#include "color.h"
+#include "Color.h"
 
 #include "shake.h"
 #include "bitmap/imageformat.h"
diff --git a/game/shared/sceneimage.cpp b/game/shared/sceneimage.cpp
index fcc379d2..791e10b1 100644
--- a/game/shared/sceneimage.cpp
+++ b/game/shared/sceneimage.cpp
@@ -698,7 +698,8 @@ bool CSceneImage::UpdateSceneImageFile( CUtlBuffer &targetBuffer, char const *pc
 			scene.crcFileName = pEntry->crcFilename;
 			scene.compiledBuffer.Put( pData, pEntry->nDataLength );
 			scene.msecs = pSummary->msecs;
-			scene.lastspeak_msecs = pSummary->lastspeech_msecs;
+			// TODO(nillerusr): support for loading other scene image versions?
+			//scene.lastspeak_msecs = pSummary->lastspeech_msecs;
 			// Load sounds
 			for ( int j = 0 ; j < pSummary->numSounds; ++j )
 			{
diff --git a/header-list.txt b/header-list.txt
index 6f2882aa..cf3f17c7 100644
--- a/header-list.txt
+++ b/header-list.txt
@@ -7,3 +7,4 @@ public/color.h
 
 public/igameevents.h
 public/engine/ICollideable.h
+public/datamap.h
diff --git a/public/appframework/iappsystem.h b/public/appframework/iappsystem.h
deleted file mode 120000
index 18c08320..00000000
--- a/public/appframework/iappsystem.h
+++ /dev/null
@@ -1 +0,0 @@
-IAppSystem.h
\ No newline at end of file
diff --git a/public/color.h b/public/color.h
deleted file mode 120000
index a5087046..00000000
--- a/public/color.h
+++ /dev/null
@@ -1 +0,0 @@
-Color.h
\ No newline at end of file
diff --git a/public/datacache/iprecachesystem.h b/public/datacache/iprecachesystem.h
index fa21075f..e569139e 100644
--- a/public/datacache/iprecachesystem.h
+++ b/public/datacache/iprecachesystem.h
@@ -17,7 +17,7 @@
 #include "tier0/dbg.h"
 #include "tier2/tier2.h"
 #include "tier2/resourceprecacher.h"
-#include "appframework/iappsystem.h"
+#include "appframework/IAppSystem.h"
 
 //-----------------------------------------------------------------------------
 // Resource access control API
diff --git a/public/datamap.h b/public/datamap.h
index 79a0a352..dd46b830 100644
--- a/public/datamap.h
+++ b/public/datamap.h
@@ -249,7 +249,7 @@ typedef void (CBaseEntity::*inputfunc_t)(inputdata_t &data);
 struct datamap_t;
 struct typedescription_t;
 
-#if 0
+#if SOURCE_ASW
 enum
 {
         PC_NON_NETWORKED_ONLY = 0,
diff --git a/public/networkvar.h b/public/networkvar.h
index 5cd16450..652a40cf 100644
--- a/public/networkvar.h
+++ b/public/networkvar.h
@@ -21,7 +21,7 @@
 
 #pragma warning( disable : 4284 ) // warning C4284: return type for 'CNetworkVarT<int>::operator ->' is 'int *' (ie; not a UDT or reference to a UDT.  Will produce errors if applied using infix notation)
 
-#define MyOffsetOf( type, var ) ( (int)&((type*)0)->var )
+#define MyOffsetOf( type, var ) ( (intp)&((type*)0)->var )
 
 #ifdef _DEBUG
 	#undef new
diff --git a/public/soundsystem/isoundsystem.h b/public/soundsystem/isoundsystem.h
index 8a370908..6ebbd548 100644
--- a/public/soundsystem/isoundsystem.h
+++ b/public/soundsystem/isoundsystem.h
@@ -10,7 +10,7 @@
 #pragma once
 #endif
 
-#include "appframework/iappsystem.h"
+#include "appframework/IAppSystem.h"
 
 
 //-----------------------------------------------------------------------------
diff --git a/public/tier0/logging.h b/public/tier0/logging.h
index 47bf4e0b..a58d906c 100644
--- a/public/tier0/logging.h
+++ b/public/tier0/logging.h
@@ -16,7 +16,7 @@
 #pragma once
 #endif
 
-#include "color.h"
+#include "Color.h"
 #include "icommandline.h"
 #include <stdio.h>
 
@@ -765,4 +765,4 @@ PLATFORM_INTERFACE LoggingResponse_t LoggingSystem_LogAssert( PRINTF_FORMAT_STRI
 
 #endif //#if !defined(__SPU__)
 
-#endif // LOGGING_H
\ No newline at end of file
+#endif // LOGGING_H
diff --git a/public/vscript/ivscript.h b/public/vscript/ivscript.h
index d385225e..18ded53a 100644
--- a/public/vscript/ivscript.h
+++ b/public/vscript/ivscript.h
@@ -97,7 +97,7 @@
 
 #include "platform.h"
 #include "datamap.h"
-#include "appframework/iappsystem.h"
+#include "appframework/IAppSystem.h"
 #include "tier1/functors.h"
 #include "tier0/memdbgon.h"
 
diff --git a/wscript b/wscript
index 998074f1..b3d38265 100644
--- a/wscript
+++ b/wscript
@@ -107,7 +107,7 @@ projects={
 		'dedicated_main',
 		'dmxloader',
 		'engine',
-		'game/server',
+#		'game/server',
 		'ivp/havana',
 		'ivp/havana/havok/hk_base',
 		'ivp/havana/havok/hk_math',