diff --git a/common/dbcore.cpp b/common/dbcore.cpp
index 84d2528f0..7570fd01e 100644
--- a/common/dbcore.cpp
+++ b/common/dbcore.cpp
@@ -1,18 +1,16 @@
-#include "../common/debug.h"
-
 #ifdef _WINDOWS
 #include <winsock2.h>
 #endif
 
+#include "../common/misc_functions.h"
+
+#include "dbcore.h"
+
+#include <errmsg.h>
 #include <fstream>
 #include <iostream>
-#include <errmsg.h>
 #include <mysqld_error.h>
-#include <limits.h>
-#include "dbcore.h"
 #include <string.h>
-#include "../common/misc_functions.h"
-#include <cstdlib>
 
 #ifdef _WINDOWS
 	#define snprintf	_snprintf
diff --git a/common/dbcore.h b/common/dbcore.h
index 0cdceb61b..b23d58a9e 100644
--- a/common/dbcore.h
+++ b/common/dbcore.h
@@ -6,15 +6,12 @@
 	#include <windows.h>
 #endif
 
+#include "../common/mutex.h"
+#include "../common/mysql_request_result.h"
+#include "../common/types.h"
+
 #include <mysql.h>
 #include <string.h>
-#include "../common/types.h"
-#include "../common/mutex.h"
-#include "../common/linked_list.h"
-#include "../common/queue.h"
-#include "../common/timer.h"
-#include "../common/condition.h"
-#include "../common/mysql_request_result.h"
 
 class DBcore {
 public: