diff --git a/src/map/clif.h b/src/map/clif.h
index 6dbb7f59c7..d13ab9037d 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -10,10 +10,19 @@ struct storage;
 struct guild_storage;
 //#include "map.h"
 struct block_list;
+struct unit_data;
 struct map_session_data;
 struct homun_data;
-struct unit_data;
+struct pet_data;
+struct npc_data;
+struct chat_data;
 struct flooritem_data;
+struct skill_unit;
+struct vending;
+struct party;
+struct party_data;
+struct guild;
+#include <stdarg.h>
 
 // server->client protocol version
 // v7 - 2005-04-11aSakexe+ - 0x229, 0x22a, 0x22b, 0x22c
diff --git a/src/map/intif.h b/src/map/intif.h
index f80041847e..7f7cfb392f 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -4,6 +4,13 @@
 #ifndef _INTIF_H_
 #define _INFIF_H_
 
+//#include "../common/mmo.h"
+struct party_member;
+struct guild_member;
+struct guild_position;
+struct s_pet;
+struct s_homunculus;
+
 int intif_parse(int fd);
 
 int intif_GMmessage(const char* mes,int len,int flag);
diff --git a/src/map/pc.c b/src/map/pc.c
index e73f0a06ef..d4fd5f94c3 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -35,6 +35,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>