4 files changed, 2 insertions, 18 deletions
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
index c328594e..82174343 100644
--- a/src/core/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
@@ -112,20 +112,17 @@ public:
 	};
 
 	bool                  m_bFirstCapture;
-	char _pad0[3];
 #ifdef __DINPUT_INCLUDED__
 	DIJOYSTATE2           m_OldState;
 	DIJOYSTATE2           m_NewState;
 #else
-	uint8 ___padd[0x110 * 2];
+	uint32 ___padd[0x110 / 4 * 2];
 #endif
 	wchar                 m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH];
 	bool                  m_aButtonStates[MAX_BUTTONS];
-	char _pad1[3];
 	tControllerConfigBind m_aSettings[MAX_CONTROLLERACTIONS][MAX_CONTROLLERTYPES];
 	bool                  m_aSimCheckers[MAX_SIMS][MAX_CONTROLLERTYPES];
 	bool                  m_bMouseAssociated;
-	char _pad2[3];
 	
 	CControllerConfigManager();
 
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 9ebd6396..b3b0849b 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -155,7 +155,6 @@ public:
 	uint8 DisablePlayerControls;
 	int8 bApplyBrakes;
 	char CheatString[12];
-	char _pad0[3];
 	int32 LastTimeTouched;
 	int32 AverageWeapon;
 	int32 AverageEntries;
diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h
index 19c5ce23..ff31418c 100644
--- a/src/core/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
@@ -31,22 +31,13 @@ public:
 	uint32 m_nLastBumpPlayerCarTimer;
 	uint32 m_nUnusedTaxiTimer;
 	bool m_bUnusedTaxiThing;
-	int8 field_197;
-	int8 field_198;
-	int8 field_199;
 	uint32 m_nNextSexFrequencyUpdateTime;
 	uint32 m_nNextSexMoneyUpdateTime;
 	int32 m_nSexFrequency;
 	CCivilianPed *m_pHooker;
 	int8 m_WBState; // eWastedBustedState
-	int8 field_217;
-	int8 field_218;
-	int8 field_219;
 	uint32 m_nWBTime;
 	bool m_bInRemoteMode;
-	int8 field_225;
-	int8 field_226;
-	int8 field_227;
 	uint32 m_nTimeLostRemoteCar;
 	uint32 m_nTimeLastHealthLoss;
 	uint32 m_nTimeLastArmourLoss;
@@ -54,8 +45,6 @@ public:
 	int32 m_nUpsideDownCounter;
 	int32 field_248;
 	int16 m_nTrafficMultiplier;
-	int8 field_254;
-	int8 field_255;
 	float m_fRoadDensity;
 	uint32 m_nPreviousTimeRewardedForExplosion;
 	int32 m_nExplosionsSinceLastReward;
@@ -90,7 +79,6 @@ public:
 	void FindClosestCarSectorList(CPtrList&, CPed*, float, float, float, float, float*, CVehicle**);
 
 	~CPlayerInfo() { };
-	void dtor(void) { this->CPlayerInfo::~CPlayerInfo(); }
 };
 
 static_assert(sizeof(CPlayerInfo) == 0x13C, "CPlayerInfo: error");
diff --git a/src/core/timebars.cpp b/src/core/timebars.cpp
index 93d85f8d..5c2dbe3a 100644
--- a/src/core/timebars.cpp
+++ b/src/core/timebars.cpp
@@ -1,5 +1,5 @@
-#ifndef MASTER
 #include "common.h"
+#ifndef MASTER
 #include "Font.h"
 #include "Frontend.h"
 #include "Timer.h"