diff --git a/common/database.cpp b/common/database.cpp
index aed844f64..d53141e71 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -28,7 +28,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 #include <map>
 
 // Disgrace: for windows compile
diff --git a/common/database.h b/common/database.h
index c70464094..e1d4c6fd6 100644
--- a/common/database.h
+++ b/common/database.h
@@ -222,7 +222,7 @@ public:
 	uint32	GetRaidID(const char* name);
 	const char *GetRaidLeaderName(uint32 rid);
 
-	bool Database::CheckDatabaseConversions();
+	bool CheckDatabaseConversions();
 
 	/*
 	* Database Variables