4 files changed, 2 insertions, 6 deletions
diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp
index be29379c..8859e61e 100644
--- a/src/peds/Gangs.cpp
+++ b/src/peds/Gangs.cpp
@@ -3,7 +3,6 @@
 #include "ModelIndices.h"
 #include "Gangs.h"
 #include "Weapon.h"
-#include "SaveBuf.h"
 
 CGangInfo CGangs::Gang[NUM_GANGS];
 
@@ -73,6 +72,6 @@ INITSAVEBUF
 	CheckSaveHeader(buf, 'G','N','G','\0', size - SAVE_HEADER_SIZE);
 
 	for (int i = 0; i < NUM_GANGS; i++)
-		ReadSaveBuf(&Gang[i], buf);
+		Gang[i] = ReadSaveBuf<CGangInfo>(buf);
 VALIDATESAVEBUF(size);
 }
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 8e55510c..5e1fb842 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -32,7 +32,6 @@
 #include "Floater.h"
 #include "Range2D.h"
 #include "Wanted.h"
-#include "SaveBuf.h"
 
 CPed *gapTempPedList[50];
 uint16 gnNumTempPedList;
diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp
index dcd4c717..bacb1a78 100644
--- a/src/peds/PedType.cpp
+++ b/src/peds/PedType.cpp
@@ -3,7 +3,6 @@
 #include "General.h"
 #include "FileMgr.h"
 #include "PedType.h"
-#include "SaveBuf.h"
 
 CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
 CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS];
@@ -202,7 +201,7 @@ INITSAVEBUF
 	CheckSaveHeader(buf, 'P', 'T', 'P', '\0', size - SAVE_HEADER_SIZE);
 
 	for(int i = 0; i < NUM_PEDTYPES; i++)
-		ReadSaveBuf(ms_apPedType[i], buf);
+		*ms_apPedType[i] = ReadSaveBuf<CPedType>(buf);
 VALIDATESAVEBUF(size)
 }
 
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index a67e2abc..46578486 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -16,7 +16,6 @@
 #include "Pools.h"
 #include "Darkel.h"
 #include "CarCtrl.h"
-#include "SaveBuf.h"
 
 #define PAD_MOVE_TO_GAME_WORLD_MOVE 60.0f