diff --git a/public/eiface.h b/public/eiface.h
index d9f4c10b..044f543c 100644
--- a/public/eiface.h
+++ b/public/eiface.h
@@ -24,6 +24,7 @@
 #include "tier1/bitbuf.h"
 #include "tier1/utlmap.h"
 #include "tier1/utlstring.h"
+#include "tier1/bufferstring.h"
 #include <steam/steamclientpublic.h>
 
 //-----------------------------------------------------------------------------
@@ -77,7 +78,6 @@ class ILoopModePrerequisiteRegistry;
 struct URLArgument_t;
 struct vis_info_t;
 class IHLTVServer;
-class CBufferString;
 
 namespace google
 {
diff --git a/public/filesystem.h b/public/filesystem.h
index c946693e..9a501073 100644
--- a/public/filesystem.h
+++ b/public/filesystem.h
@@ -15,15 +15,13 @@
 #include <limits.h>
 
 #include "tier0/threadtools.h"
-#include "tier0/memalloc.h"
-#include "tier0/tslist.h"
 #include "tier0/interface.h"
 #include "tier1/utlsymbol.h"
 #include "tier1/utlstring.h"
-//#include "tier1/functors.h" 
 #include "tier1/checksum_crc.h"
 #include "tier1/utldelegate.h"
 #include "tier1/utlqueue.h"
+#include "tier1/bufferstring.h"
 #include "appframework/IAppSystem.h"
 #include "tier2/tier2.h"
 
@@ -518,9 +516,9 @@ public:
 	virtual void			SetSearchPathReadOnly( const char *pPathID, const char *, bool bReadOnly ) = 0;
 
 	// converts a partial path into a full path
-	virtual const char		*RelativePathToFullPath( const char *pFileName, const char *pPathID, char *pLocalPath, int localPathBufferSize, PathTypeFilter_t pathFilter = FILTER_NONE, PathTypeQuery_t *pPathType = NULL ) = 0;
+	virtual const char		*RelativePathToFullPath( const char *pFileName, const char *pPathID, CBufferString &pLocalPath, PathTypeFilter_t pathFilter = FILTER_NONE, PathTypeQuery_t *pPathType = NULL ) = 0;
 
-	virtual bool			GetWritePath(const char*, const char*, CBufferString *) = 0;
+	virtual bool			GetWritePath(const char*, const char*, CBufferString &) = 0;
 
 	// Returns the nSearchPathsToGet amount of paths, each path is separated by ;s. Returns true if pathID has any paths
 	virtual bool			GetSearchPath( const char *pathID, GetSearchPathTypes_t pathType, CBufferString *pPath, int nSearchPathsToGet ) = 0;
@@ -582,17 +580,9 @@ public:
 	virtual void			FindClose( FileFindHandle_t handle ) = 0;
 
 	// Same as FindFirst, but you can filter by path ID, which can make it faster.
-	virtual const char		*FindFirstEx( 
-		const char *pWildCard, 
-		const char *pPathID,
-		FileFindHandle_t *pHandle
-		) = 0;
+	virtual const char		*FindFirstEx( const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle ) = 0;
 
-	virtual void			FindFileAbsoluteList(
-		CUtlVector<CUtlString> &output,
-		const char *pWildCard,
-		const char *pPathID
-		) = 0;
+	virtual void			FindFileAbsoluteList( CUtlVector<CUtlString> &output, const char *pWildCard, const char *pPathID ) = 0;
 
 	//--------------------------------------------------------
 	// File name and directory operations
@@ -603,7 +593,7 @@ public:
 	virtual bool			FullPathToRelativePath( const char *pFullpath, const char *pPathID, char *pRelative, int maxlen ) = 0;
 
 	// Gets the current working directory
-	virtual bool			GetCurrentDirectory( char* pDirectory, int maxlen ) = 0;
+	virtual bool			GetCurrentDirectory( CBufferString &pDirectory ) = 0;
 
 	//--------------------------------------------------------
 	// Filename dictionary operations
diff --git a/public/networksystem/inetworkserializer.h b/public/networksystem/inetworkserializer.h
index 48badfb2..33b5e7f9 100644
--- a/public/networksystem/inetworkserializer.h
+++ b/public/networksystem/inetworkserializer.h
@@ -59,11 +59,4 @@ public:
 	virtual bool Unserialize(bf_read &pBuf, void *pData, NetworkSerializationMode_t unused) = 0;
 };
 
-class CNetworkSerializerPB : public INetworkSerializable
-{
-private:
-	const char *m_szUnscopedName;
-	NetMessageInfo_t m_MessageInfo;
-};
-
 #endif /* NETWORKSERIALIZER_H */
\ No newline at end of file
diff --git a/public/networksystem/iprotobufbinding.h b/public/networksystem/iprotobufbinding.h
index 45514639..3b6c095c 100644
--- a/public/networksystem/iprotobufbinding.h
+++ b/public/networksystem/iprotobufbinding.h
@@ -7,10 +7,9 @@
 
 #include <tier1/utlstring.h>
 #include <tier1/bitbuf.h>
+#include <inetchannel.h>
 #include "Color.h"
 
-enum NetChannelBufType_t;
-
 abstract_class IProtobufBinding
 {
 public:
diff --git a/public/tier0/dbg.h b/public/tier0/dbg.h
index 31f0019e..60eed9a6 100644
--- a/public/tier0/dbg.h
+++ b/public/tier0/dbg.h
@@ -14,7 +14,7 @@
 
 #include "tier0/platform.h"
 #include "tier0/basetypes.h"
-#include <tier1/strtools.h>
+#include "tier1/strtools.h"
 #include "dbgflag.h"
 #include "logging.h"
 #include <math.h>
diff --git a/public/tier1/bufferstring.h b/public/tier1/bufferstring.h
index 94fc2d8b..33fe4ca3 100644
--- a/public/tier1/bufferstring.h
+++ b/public/tier1/bufferstring.h
@@ -282,7 +282,7 @@ private:
 		CBufferStringMemory() {}
 	} m_Memory;
 };
-	
+
 #define BUFFER_STRING_STACK(_size) CBufferString::InitStackAlloc(stackalloc(sizeof(CBufferString) + _size), ALIGN_VALUE(sizeof(CBufferString) + _size, 16 ) - sizeof(CBufferString))
 
 #endif /* BUFFERSTRING_H */
\ No newline at end of file