diff --git a/common/database.cpp b/common/database.cpp
index 80ff355d7..3de2a308b 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -15,13 +15,13 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+
 #include "../common/debug.h"
 #include "../common/rulesys.h"
-#include <cmath>
+
 #include <ctype.h>
 #include <iomanip>
 #include <iostream>
-#include <limits.h>
 #include <map>
 #include <mysqld_error.h>
 #include <stdio.h>
@@ -42,8 +42,8 @@
 
 #include "database.h"
 #include "eq_packet_structs.h"
-#include "string_util.h"
 #include "extprofile.h"
+#include "string_util.h"
 
 extern Client client;
 
diff --git a/common/database.h b/common/database.h
index 8f5d7430c..1cfb88e71 100644
--- a/common/database.h
+++ b/common/database.h
@@ -33,23 +33,9 @@
 //atoi is not uint32 or uint32 safe!!!!
 #define atoul(str) strtoul(str, nullptr, 10)
 
-//class Spawn;
-class Corpse;
-class Spawn2;
-class NPC;
-class SpawnGroupList;
-class Petition;
-class Client;
-class Merc;
-class MySQLRequestResult;
-struct Combine_Struct;
-//struct Faction;
-//struct FactionMods;
-//struct FactionValue;
-struct ZonePoint;
-struct NPCType;
 class Inventory;
-class ItemInst;
+class MySQLRequestResult;
+class Client;
 
 struct EventLogDetails_Struct {
 	uint32	id;
@@ -81,11 +67,6 @@ struct VarCache_Struct {
 	char value[0];
 };
 
-struct PlayerProfile_Struct;
-struct GuildRankLevel_Struct;
-struct GuildRanks_Struct;
-struct ExtendedProfile_Struct;
-struct GuildMember_Struct;
 class PTimerList;
 
 #pragma pack(1)