9 files changed, 17 insertions, 13 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 6cfeb7d1a..23f5d1ea0 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -702,7 +702,7 @@ int char_mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 int char_memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch)
 {
 	StringBuf buf;
-	SqlStmt *stmt = NULL;
+	struct SqlStmt *stmt = NULL;
 	int i, j;
 	const char *tablename = NULL;
 	const char *selectoption = NULL;
@@ -915,7 +915,7 @@ int char_mmo_gender(const struct char_session_data *sd, const struct mmo_charsta
 // Loads the basic character rooster for the given account. Returns total buffer used.
 int char_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 {
-	SqlStmt* stmt;
+	struct SqlStmt *stmt;
 	struct mmo_charstatus p;
 	int j = 0, i;
 	char last_map[MAP_NAME_LENGTH_EXT];
@@ -1015,7 +1015,7 @@ int char_mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_every
 	char t_msg[128] = "";
 	struct mmo_charstatus* cp;
 	StringBuf buf;
-	SqlStmt* stmt;
+	struct SqlStmt *stmt;
 	char last_map[MAP_NAME_LENGTH_EXT];
 	char save_map[MAP_NAME_LENGTH_EXT];
 	char point_map[MAP_NAME_LENGTH_EXT];
@@ -2341,7 +2341,7 @@ int char_parse_fromlogin_changesex_reply(int fd)
 	int char_id = 0, class_ = 0, guild_id = 0;
 	int i;
 	struct char_auth_node *node;
-	SqlStmt *stmt;
+	struct SqlStmt *stmt;
 
 	int acc = RFIFOL(fd,2);
 	int sex = RFIFOB(fd,6);
@@ -3277,7 +3277,7 @@ void char_ban(int account_id, int char_id, time_t *unban_time, short year, short
 {
 	time_t timestamp;
 	struct tm *tmtime;
-	SqlStmt* stmt = SQL->StmtMalloc(inter->sql_handle);
+	struct SqlStmt *stmt = SQL->StmtMalloc(inter->sql_handle);
 
 	nullpo_retv(unban_time);
 
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 464a2092b..2c9942dac 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -63,7 +63,7 @@ void inter_auction_save(struct auction_data *auction)
 {
 	int j;
 	StringBuf buf;
-	SqlStmt* stmt;
+	struct SqlStmt *stmt;
 
 	if( !auction )
 		return;
@@ -93,7 +93,7 @@ unsigned int inter_auction_create(struct auction_data *auction)
 {
 	int j;
 	StringBuf buf;
-	SqlStmt* stmt;
+	struct SqlStmt *stmt;
 
 	if( !auction )
 		return false;
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index c637f12fd..ab15d5ef9 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -33,6 +33,7 @@
 #include "common/nullpo.h"
 #include "common/showmsg.h"
 #include "common/socket.h"
+#include "common/sql.h"
 #include "common/strlib.h"
 #include "common/timer.h"
 
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index e5fde2330..bfb0009e6 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -163,7 +163,7 @@ bool mapif_homunculus_save(const struct s_homunculus *hd)
 		flag = false;
 	} else {
 		int i;
-		SqlStmt *stmt = SQL->StmtMalloc(inter->sql_handle);
+		struct SqlStmt *stmt = SQL->StmtMalloc(inter->sql_handle);
 
 		if (SQL_ERROR == SQL->StmtPrepare(stmt, "REPLACE INTO `%s` (`homun_id`, `id`, `lv`) VALUES (%d, ?, ?)", skill_homunculus_db, hd->hom_id)) {
 			SqlStmt_ShowDebug(stmt);
diff --git a/src/char/int_mail.c b/src/char/int_mail.c
index b75a362fb..bf3403b5f 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.c
@@ -129,7 +129,7 @@ static int inter_mail_fromsql(int char_id, struct mail_data* md)
 int inter_mail_savemessage(struct mail_message* msg)
 {
 	StringBuf buf;
-	SqlStmt* stmt;
+	struct SqlStmt *stmt;
 	int j;
 
 	nullpo_ret(msg);
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index b28c81331..cf93db51e 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -52,7 +52,7 @@ struct quest *mapif_quests_fromsql(int char_id, int *count)
 {
 	struct quest *questlog = NULL;
 	struct quest tmp_quest;
-	SqlStmt *stmt;
+	struct SqlStmt *stmt;
 	StringBuf buf;
 	int i;
 	int sqlerror = SQL_SUCCESS;
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 705aa02d2..e46a1c80f 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -277,7 +277,7 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd)
 {
 #ifdef GP_BOUND_ITEMS
 	StringBuf buf;
-	SqlStmt* stmt;
+	struct SqlStmt *stmt;
 	struct item item;
 	int j, i=0, s=0, bound_qt=0;
 	struct item items[MAX_INVENTORY];
diff --git a/src/char/inter.c b/src/char/inter.c
index 4ef94efdf..4e1adbe15 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -42,6 +42,7 @@
 #include "common/nullpo.h"
 #include "common/showmsg.h"
 #include "common/socket.h"
+#include "common/sql.h"
 #include "common/strlib.h"
 #include "common/timer.h"
 
diff --git a/src/char/inter.h b/src/char/inter.h
index b8bcb2def..84cb6c640 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -23,15 +23,17 @@
 
 #include "common/hercules.h"
 #include "common/db.h"
-#include "common/sql.h"
 
 #include <stdarg.h>
 
+/* Forward Declarations */
+struct Sql; // common/sql.h
+
 /**
  * inter interface
  **/
 struct inter_interface {
-	Sql* sql_handle;
+	struct Sql *sql_handle;
 	const char* (*msg_txt) (int msg_number);
 	bool (*msg_config_read) (const char *cfg_name, bool allow_override);
 	void (*do_final_msg) (void);