6 files changed, 8 insertions, 16 deletions
diff --git a/src/login/HPMlogin.c b/src/login/HPMlogin.c
index c9e0e094c..0a7729da8 100644
--- a/src/login/HPMlogin.c
+++ b/src/login/HPMlogin.c
@@ -7,24 +7,20 @@
 
 #include "common/HPM.h"
 #include "common/cbasetypes.h"
+
+#if 0 // TODO (HPMDataCheck is disabled for the time being)
 #include "common/conf.h"
 #include "common/db.h"
 #include "common/des.h"
 #include "common/ers.h"
-#include "common/malloc.h"
 #include "common/mapindex.h"
 #include "common/mmo.h"
-#include "common/showmsg.h"
 #include "common/socket.h"
 #include "common/strlib.h"
 #include "common/sysinfo.h"
-
+#include "login/login.h"
 #include "common/HPMDataCheck.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#endif
 
 bool HPM_login_grabHPData(struct HPDataOperationStorage *ret, enum HPluginDataTypes type, void *ptr) {
 	/* record address */
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index 8696666e3..3f72e6867 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -7,6 +7,7 @@
 #include "config/core.h" // CONSOLE_INPUT
 #include "account.h"
 
+#include "common/cbasetypes.h"
 #include "common/console.h"
 #include "common/malloc.h"
 #include "common/mmo.h"
@@ -15,10 +16,8 @@
 #include "common/socket.h"
 #include "common/sql.h"
 #include "common/strlib.h"
-#include "common/timer.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 /// global defines
 #define ACCOUNT_SQL_DB_VERSION 20110114
diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c
index 533ee3c4c..b4fce009d 100644
--- a/src/login/ipban_sql.c
+++ b/src/login/ipban_sql.c
@@ -9,16 +9,12 @@
 #include "login/login.h"
 #include "login/loginlog.h"
 #include "common/cbasetypes.h"
-#include "common/db.h"
-#include "common/malloc.h"
 #include "common/nullpo.h"
 #include "common/sql.h"
-#include "common/socket.h"
 #include "common/strlib.h"
 #include "common/timer.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 // global sql settings
 static char   global_db_hostname[32] = "127.0.0.1";
diff --git a/src/login/login.c b/src/login/login.c
index 9175bed56..1fdf2d198 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -11,6 +11,7 @@
 #include "login/ipban.h"
 #include "login/loginlog.h"
 #include "common/HPM.h"
+#include "common/cbasetypes.h"
 #include "common/core.h"
 #include "common/db.h"
 #include "common/malloc.h"
@@ -25,7 +26,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 struct login_interface login_s;
 struct Login_Config login_config;
diff --git a/src/login/login.h b/src/login/login.h
index 5343b31a0..f05ff6d0f 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -5,7 +5,9 @@
 #ifndef LOGIN_LOGIN_H
 #define LOGIN_LOGIN_H
 
+#include "common/cbasetypes.h"
 #include "common/core.h" // CORE_ST_LAST
+#include "common/db.h"
 #include "common/mmo.h" // NAME_LENGTH,SEX_*
 
 struct mmo_account;
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
index da9beda4f..da698e187 100644
--- a/src/login/loginlog_sql.c
+++ b/src/login/loginlog_sql.c
@@ -13,7 +13,6 @@
 #include "common/sql.h"
 #include "common/strlib.h"
 
-#include <string.h>
 #include <stdlib.h> // exit
 
 // global sql settings (in ipban_sql.c)