diff --git a/lib/linux64/libtier0.so b/lib/linux64/libtier0.so
index db58ad04..07400104 100644
Binary files a/lib/linux64/libtier0.so and b/lib/linux64/libtier0.so differ
diff --git a/lib/linux64/mathlib.a b/lib/linux64/mathlib.a
index 5f1be095..93e8746e 100644
Binary files a/lib/linux64/mathlib.a and b/lib/linux64/mathlib.a differ
diff --git a/lib/linux64/tier1.a b/lib/linux64/tier1.a
index 9f18416f..736d1a0c 100644
Binary files a/lib/linux64/tier1.a and b/lib/linux64/tier1.a differ
diff --git a/lib/public/win64/interfaces.lib b/lib/public/win64/interfaces.lib
index dc820d3d..31c3d9d5 100644
Binary files a/lib/public/win64/interfaces.lib and b/lib/public/win64/interfaces.lib differ
diff --git a/lib/public/win64/mathlib.lib b/lib/public/win64/mathlib.lib
index d2390c02..f0962bbf 100644
Binary files a/lib/public/win64/mathlib.lib and b/lib/public/win64/mathlib.lib differ
diff --git a/lib/public/win64/tier0.lib b/lib/public/win64/tier0.lib
index eb453be4..b1e20283 100644
Binary files a/lib/public/win64/tier0.lib and b/lib/public/win64/tier0.lib differ
diff --git a/lib/public/win64/tier1.lib b/lib/public/win64/tier1.lib
index ff7ffa3d..922a0796 100644
Binary files a/lib/public/win64/tier1.lib and b/lib/public/win64/tier1.lib differ
diff --git a/linux_sdk/Makefile b/linux_sdk/Makefile
index 4b2f77d4..7ae4f15c 100644
--- a/linux_sdk/Makefile
+++ b/linux_sdk/Makefile
@@ -103,7 +103,7 @@ DEFINES +=-DX64BITS -DPLATFORM_64BITS -DVPROF_LEVEL=1 -DSWDS -D_finite=finite -D
 UNDEF = -Usprintf -Ustrncpy -UPROTECTED_THINGS_ENABLE
 
 BASE_CFLAGS = -fPIC -fno-strict-aliasing -Wall -Wsign-compare -Wno-conversion -Wno-overloaded-virtual -Wno-non-virtual-dtor -Wno-invalid-offsetof \
-	      -Wno-unknown-pragmas -Wno-unused
+	      -Wno-unknown-pragmas -Wno-unused -Wno-c++11-narrowing
 SHLIBCFLAGS = -fPIC
 
 # Clang >= 3 || GCC >= 4.7
diff --git a/linux_sdk/Makefile.tier1 b/linux_sdk/Makefile.tier1
index d9192573..670fb434 100644
--- a/linux_sdk/Makefile.tier1
+++ b/linux_sdk/Makefile.tier1
@@ -30,7 +30,7 @@ DO_CC += -o $@ -c $<
 
 LIB_OBJS= \
 	$(LIB_OBJ_DIR)/bitbuf.o \
-	$(LIB_OBJ_DIR)/byteswap.o \
+	$(LIB_OBJ_DIR)/cbyteswap.o \
 	$(LIB_OBJ_DIR)/characterset.o \
 	$(LIB_OBJ_DIR)/checksum_crc.o \
 	$(LIB_OBJ_DIR)/checksum_md5.o \
@@ -42,7 +42,6 @@ LIB_OBJS= \
 	$(LIB_OBJ_DIR)/mempool.o \
 	$(LIB_OBJ_DIR)/memstack.o \
 	$(LIB_OBJ_DIR)/NetAdr.o \
-	$(LIB_OBJ_DIR)/newbitbuf.o \
 	$(LIB_OBJ_DIR)/processor_detect.o \
 	$(LIB_OBJ_DIR)/rangecheckedvar.o \
 	$(LIB_OBJ_DIR)/stringpool.o \
@@ -50,9 +49,7 @@ LIB_OBJS= \
 	$(LIB_OBJ_DIR)/tier1.o \
 	$(LIB_OBJ_DIR)/undiff.o \
 	$(LIB_OBJ_DIR)/uniqueid.o \
-	$(LIB_OBJ_DIR)/utlbuffer.o \
 	$(LIB_OBJ_DIR)/utlbufferutil.o \
-	$(LIB_OBJ_DIR)/utlstring.o \
 	$(LIB_OBJ_DIR)/utlsymbol.o \
 
 all: dirs $(NAME).$(SHLIBEXT)
diff --git a/mathlib/mathlib.vcxproj b/mathlib/mathlib.vcxproj
index d132f60d..8b8fa2a4 100644
--- a/mathlib/mathlib.vcxproj
+++ b/mathlib/mathlib.vcxproj
@@ -22,7 +22,7 @@
     <ProjectName>mathlib</ProjectName>
     <ProjectGuid>{884C66F2-7F84-4570-AE6C-B634C1113D69}</ProjectGuid>
     <RootNamespace>mathlib</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/public/tier0/threadtools.h b/public/tier0/threadtools.h
index 3d4ac8fd..668945ea 100644
--- a/public/tier0/threadtools.h
+++ b/public/tier0/threadtools.h
@@ -1436,11 +1436,11 @@ public:
 		{
 			while( ! MessageWaiting() )
 				SignalEvent.Wait();
-			QueueAccessMutex.Lock();
+			QueueAccessMutex.Lock( __FILE__, __LINE__ );
 			if (! Head )
 			{
 				// multiple readers could make this null
-				QueueAccessMutex.Unlock();
+				QueueAccessMutex.Unlock( __FILE__, __LINE__ );
 				continue;
 			}
 			*( pMsg ) = Head->Data;
@@ -1448,7 +1448,7 @@ public:
 			Head = Head->Next;
 			if (! Head)										// if empty, fix tail ptr
 				Tail = NULL;
-			QueueAccessMutex.Unlock();
+			QueueAccessMutex.Unlock( __FILE__, __LINE__ );
 			delete remove_this;
 			break;
 		}
@@ -1459,7 +1459,7 @@ public:
 		MsgNode *new1=new MsgNode;
 		new1->Data=Msg;
 		new1->Next=NULL;
-		QueueAccessMutex.Lock();
+		QueueAccessMutex.Lock( __FILE__, __LINE__ );
 		if ( Tail )
 		{
 			Tail->Next=new1;
@@ -1471,7 +1471,7 @@ public:
 			Tail = new1;
 		}
 		SignalEvent.Set();
-		QueueAccessMutex.Unlock();
+		QueueAccessMutex.Unlock( __FILE__, __LINE__ );
 	}
 };
 
diff --git a/public/tier1/utlmemory.h b/public/tier1/utlmemory.h
index ad4ae8f9..ded9f455 100644
--- a/public/tier1/utlmemory.h
+++ b/public/tier1/utlmemory.h
@@ -16,6 +16,7 @@
 
 #include "tier0/dbg.h"
 #include <string.h>
+#include <cstdint>
 #include "tier0/platform.h"
 
 #include "tier0/memalloc.h"
diff --git a/tier1/bitbuf.cpp b/tier1/bitbuf.cpp
index 882b71c6..4a150d4d 100644
--- a/tier1/bitbuf.cpp
+++ b/tier1/bitbuf.cpp
@@ -1157,7 +1157,7 @@ float bf_read::ReadBitCoordMP( bool bIntegral, bool bLowPrecision )
 		-1.f/(1<<COORD_FRACTIONAL_BITS_MP_LOWPRECISION)
 	};
 	//equivalent to: float multiply = mul_table[ ((flags & SIGN) ? 1 : 0) + bLowPrecision*2 ];
-	float multiply = *(float*)((uintptr_t)&mul_table[0] + (flags & 4) + bLowPrecision*8);
+	float multiply = *(float*)((uintp)&mul_table[0] + (flags & 4) + bLowPrecision*8);
 
 	static const unsigned char numbits_table[8] =
 	{
diff --git a/tier1/tier1.vcxproj b/tier1/tier1.vcxproj
index 6d2f808e..dc557d29 100644
--- a/tier1/tier1.vcxproj
+++ b/tier1/tier1.vcxproj
@@ -22,7 +22,7 @@
     <ProjectName>tier1</ProjectName>
     <ProjectGuid>{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}</ProjectGuid>
     <RootNamespace>tier1</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">