diff --git a/dll/flat.cpp b/dll/flat.cpp
index dfeb9846..d68e15a8 100644
--- a/dll/flat.cpp
+++ b/dll/flat.cpp
@@ -792,7 +792,7 @@ STEAMAPI_API SteamAPICall_t SteamAPI_ISteamFriends_RequestEquippedProfileItems(
     return (get_steam_client()->steam_friends)->RequestEquippedProfileItems(steamID);
 }
 
-STEAMAPI_API bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType )
+STEAMAPI_API steam_bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType )
 {
     return (get_steam_client()->steam_friends)->BHasEquippedProfileItem(steamID, itemType);
 }
diff --git a/sdk/steam/isteamgamestats.h b/sdk/steam/isteamgamestats.h
index 309ea382..d783f2e6 100644
--- a/sdk/steam/isteamgamestats.h
+++ b/sdk/steam/isteamgamestats.h
@@ -6,7 +6,7 @@
 
 #ifndef ISTEAMGAMESTATS_H
 #define ISTEAMGAMESTATS_H
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif
 
diff --git a/sdk/steam/isteammasterserverupdater.h b/sdk/steam/isteammasterserverupdater.h
index 08a4d2ad..85ebb0ed 100644
--- a/sdk/steam/isteammasterserverupdater.h
+++ b/sdk/steam/isteammasterserverupdater.h
@@ -1,4 +1,4 @@
-//====== Copyright © 1996-2008, Valve Corporation, All rights reserved. =======
+//====== Copyright © 1996-2008, Valve Corporation, All rights reserved. =======
 //
 // Purpose: interface to steam for retrieving list of game servers
 //
@@ -6,7 +6,7 @@
 
 #ifndef ISTEAMMASTERSERVERUPDATER_H
 #define ISTEAMMASTERSERVERUPDATER_H
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif
 
diff --git a/sdk/steam/isteamscreenshots001.h b/sdk/steam/isteamscreenshots001.h
index 2e6bd3d1..fc5f266f 100644
--- a/sdk/steam/isteamscreenshots001.h
+++ b/sdk/steam/isteamscreenshots001.h
@@ -6,7 +6,7 @@
 
 #ifndef ISTEAMSCREENSHOTS001_H
 #define ISTEAMSCREENSHOTS001_H
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif
 
diff --git a/sdk/steam/isteamscreenshots002.h b/sdk/steam/isteamscreenshots002.h
index 350a7d4a..d38d4f5f 100644
--- a/sdk/steam/isteamscreenshots002.h
+++ b/sdk/steam/isteamscreenshots002.h
@@ -6,7 +6,7 @@
 
 #ifndef ISTEAMSCREENSHOTS002_H
 #define ISTEAMSCREENSHOTS002_H
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif
 
diff --git a/sdk/steam/isteamtimeline.h b/sdk/steam/isteamtimeline.h
index 1ac627d6..b1716a66 100644
--- a/sdk/steam/isteamtimeline.h
+++ b/sdk/steam/isteamtimeline.h
@@ -1,4 +1,4 @@
-//====== Copyright � Valve Corporation, All rights reserved. =======
+//====== Copyright © Valve Corporation, All rights reserved. =======
 //
 // Purpose: interface to Steam Timeline
 //
@@ -6,7 +6,7 @@
 
 #ifndef ISTEAMTIMELINE_H
 #define ISTEAMTIMELINE_H
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif
 
@@ -107,9 +107,11 @@ public:
 
 #define STEAMTIMELINE_INTERFACE_VERSION "STEAMTIMELINE_INTERFACE_V001"
 
+#ifndef STEAM_API_EXPORTS
 // Global interface accessor
 inline ISteamTimeline *SteamTimeline();
 STEAM_DEFINE_USER_INTERFACE_ACCESSOR( ISteamTimeline *, SteamTimeline, STEAMTIMELINE_INTERFACE_VERSION );
+#endif
 
 
 #pragma pack( pop )
diff --git a/sdk/steam/isteamvideo001.h b/sdk/steam/isteamvideo001.h
index 03a92d6f..6a15c7c4 100644
--- a/sdk/steam/isteamvideo001.h
+++ b/sdk/steam/isteamvideo001.h
@@ -1,6 +1,6 @@
 #ifndef ISTEAMVIDEO001_H
 #define ISTEAMVIDEO001_H
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif
 
diff --git a/sdk/steam/isteamvideo002.h b/sdk/steam/isteamvideo002.h
index 06a142f6..dd16b416 100644
--- a/sdk/steam/isteamvideo002.h
+++ b/sdk/steam/isteamvideo002.h
@@ -1,6 +1,6 @@
 #ifndef ISTEAMVIDEO002_H
 #define ISTEAMVIDEO002_H
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif
 
diff --git a/sdk/steam/steam_api.h b/sdk/steam/steam_api.h
index fd297456..1824550e 100644
--- a/sdk/steam/steam_api.h
+++ b/sdk/steam/steam_api.h
@@ -177,6 +177,7 @@
 #include "isteaminventory.h"
 #include "isteaminventory001.h"
 #include "isteaminventory002.h"
+#include "isteamtimeline.h"
 #include "isteamvideo.h"
 #include "isteamvideo001.h"
 #include "isteamvideo002.h"
diff --git a/sdk/steam/steam_api_common.h b/sdk/steam/steam_api_common.h
index 53da20b4..055d092b 100644
--- a/sdk/steam/steam_api_common.h
+++ b/sdk/steam/steam_api_common.h
@@ -85,8 +85,8 @@ typedef char SteamErrMsg[ k_cchMaxSteamErrMsg ];
 #endif
 #define __cdecl
 #endif
-extern "C" typedef void (__cdecl *SteamAPIWarningMessageHook_t)(int, const char *);
-extern "C" typedef uint32 ( *SteamAPI_CheckCallbackRegistered_t )( int iCallbackNum );
+extern "C" typedef void ( __cdecl *SteamAPIWarningMessageHook_t )( int, const char *);
+extern "C" typedef uint32 ( __cdecl *SteamAPI_CheckCallbackRegistered_t )( int iCallbackNum );
 #if defined( __SNC__ )
 	#pragma diag_suppress=1700	   // warning 1700: class "%s" has virtual functions but non-virtual destructor
 #endif
diff --git a/sdk/steam/steam_api_flat.h b/sdk/steam/steam_api_flat.h
index 8519f778..4f1ba8b6 100644
--- a/sdk/steam/steam_api_flat.h
+++ b/sdk/steam/steam_api_flat.h
@@ -175,7 +175,7 @@ STEAMAPI_API void SteamAPI_ISteamFriends_ActivateGameOverlayRemotePlayTogetherIn
 STEAMAPI_API steam_bool SteamAPI_ISteamFriends_RegisterProtocolInOverlayBrowser( ISteamFriends* self, const char * pchProtocol );
 STEAMAPI_API void SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialogConnectString( ISteamFriends* self, const char * pchConnectString );
 STEAMAPI_API SteamAPICall_t SteamAPI_ISteamFriends_RequestEquippedProfileItems( ISteamFriends* self, uint64_steamid steamID );
-STEAMAPI_API bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType );
+STEAMAPI_API steam_bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType );
 STEAMAPI_API const char * SteamAPI_ISteamFriends_GetProfileItemPropertyString( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType, ECommunityProfileItemProperty prop );
 STEAMAPI_API uint32 SteamAPI_ISteamFriends_GetProfileItemPropertyUint( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType, ECommunityProfileItemProperty prop );
 
@@ -702,11 +702,13 @@ STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v015();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v016();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v017();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v018();
+STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v020();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v014();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v015();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v016();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v017();
 STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v018();
+STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v020();
 STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryUserUGCRequest( ISteamUGC* self, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage );
 STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequestPage( ISteamUGC* self, EUGCQuery eQueryType, EUGCMatchingUGCType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage );
 STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequestCursor( ISteamUGC* self, EUGCQuery eQueryType, EUGCMatchingUGCType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, const char * pchCursor );
@@ -897,8 +899,6 @@ STEAMAPI_API steam_bool SteamAPI_ISteamInventory_InspectItem( ISteamInventory* s
 
 // A versioned accessor is exported by the library
 STEAMAPI_API ISteamTimeline *SteamAPI_SteamTimeline_v001();
-// Inline, unversioned accessor to get the current version.  Essentially the same as SteamTimeline(), but using this ensures that you are using a matching library.
-inline ISteamTimeline *SteamAPI_SteamTimeline() { return SteamAPI_SteamTimeline_v001(); }
 STEAMAPI_API void SteamAPI_ISteamTimeline_SetTimelineStateDescription( ISteamTimeline* self, const char * pchDescription, float flTimeDelta );
 STEAMAPI_API void SteamAPI_ISteamTimeline_ClearTimelineStateDescription( ISteamTimeline* self, float flTimeDelta );
 STEAMAPI_API void SteamAPI_ISteamTimeline_AddTimelineEvent( ISteamTimeline* self, const char * pchIcon, const char * pchTitle, const char * pchDescription, uint32 unPriority, float flStartOffsetSeconds, float flDurationSeconds, ETimelineEventClipPriority ePossibleClip );
@@ -906,6 +906,7 @@ STEAMAPI_API void SteamAPI_ISteamTimeline_SetTimelineGameMode( ISteamTimeline* s
 
 
 // ISteamVideo
+STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v001();
 STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v002();
 STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v007();
 STEAMAPI_API void SteamAPI_ISteamVideo_GetVideoURL( ISteamVideo* self, AppId_t unVideoAppID );
@@ -1099,9 +1100,7 @@ STEAMAPI_API void SteamAPI_ISteamGameServer_SetGameTags( ISteamGameServer* self,
 STEAMAPI_API void SteamAPI_ISteamGameServer_SetGameData( ISteamGameServer* self, const char * pchGameData );
 STEAMAPI_API void SteamAPI_ISteamGameServer_SetRegion( ISteamGameServer* self, const char * pszRegion );
 STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate( ISteamGameServer* self, uint32 unIPClient, const void * pvAuthBlob, uint32 cubAuthBlobSize, CSteamID * pSteamIDUser );
-STEAMAPI_API uint64_steamid SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection( ISteamGameServer* self );
 STEAMAPI_API void SteamAPI_ISteamGameServer_SendUserDisconnect( ISteamGameServer* self, uint64_steamid steamIDUser );
-STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_BUpdateUserData( ISteamGameServer* self, uint64_steamid steamIDUser, const char * pchPlayerName, uint32 uScore );
 STEAMAPI_API void SteamAPI_ISteamGameServer_SetAdvertiseServerActive( ISteamGameServer* self, bool bActive );
 STEAMAPI_API HAuthTicket SteamAPI_ISteamGameServer_GetAuthSessionTicket( ISteamGameServer* self, void * pTicket, int cbMaxTicket, uint32 * pcbTicket, const SteamNetworkingIdentity * pSnid );
 STEAMAPI_API EBeginAuthSessionResult SteamAPI_ISteamGameServer_BeginAuthSession( ISteamGameServer* self, const void * pAuthTicket, int cbAuthTicket, uint64_steamid steamID );
@@ -1120,7 +1119,9 @@ STEAMAPI_API void SteamAPI_ISteamGameServer_ForceHeartbeat( ISteamGameServer* se
 STEAMAPI_API SteamAPICall_t SteamAPI_ISteamGameServer_AssociateWithClan( ISteamGameServer* self, uint64_steamid steamIDClan );
 STEAMAPI_API SteamAPICall_t SteamAPI_ISteamGameServer_ComputeNewPlayerCompatibility( ISteamGameServer* self, uint64_steamid steamIDNewPlayer );
 STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED( ISteamGameServer* self, uint32 unIPClient, const void * pvAuthBlob, uint32 cubAuthBlobSize, CSteamID * pSteamIDUser );
+STEAMAPI_API uint64_steamid SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection( ISteamGameServer* self );
 STEAMAPI_API void SteamAPI_ISteamGameServer_SendUserDisconnect_DEPRECATED( ISteamGameServer* self, uint64_steamid steamIDUser );
+STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_BUpdateUserData( ISteamGameServer* self, uint64_steamid steamIDUser, const char * pchPlayerName, uint32 uScore );
 
 
 // ISteamGameServerStats
diff --git a/sdk/steam/steamnetworkingsockets.h b/sdk/steam/steamnetworkingsockets.h
index 2c06b934..2bf067dd 100644
--- a/sdk/steam/steamnetworkingsockets.h
+++ b/sdk/steam/steamnetworkingsockets.h
@@ -7,7 +7,7 @@
 
 #ifndef STEAMNETWORKINGSOCKETS
 #define STEAMNETWORKINGSOCKETS
-#ifdef _WIN32
+#ifdef STEAM_WIN32
 #pragma once
 #endif