diff --git a/src/base64.c b/src/base64.c
index 5d63a67..e4ebbd2 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 
diff --git a/src/faction.c b/src/faction.c
index f4b8283..ea9bf7e 100644
--- a/src/faction.c
+++ b/src/faction.c
@@ -4,7 +4,7 @@
  * @brief Handle the Lephisto factions.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "opengl.h"
diff --git a/src/hook.c b/src/hook.c
index a6c3fb4..9a2d17a 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "log.h"
diff --git a/src/map.c b/src/map.c
index ab54157..39f74c9 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
 #include <math.h>
 #include <float.h>
 
diff --git a/src/mission.c b/src/mission.c
index ac9a51b..1b146a0 100644
--- a/src/mission.c
+++ b/src/mission.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "llua.h"
 #include "llua_space.h"
diff --git a/src/pack.c b/src/pack.c
index f6947d7..38835f0 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "pack.h"
 #include "log.h"
diff --git a/src/pack.h b/src/pack.h
index bede538..9a88545 100644
--- a/src/pack.h
+++ b/src/pack.h
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #endif
 #include <stdint.h>
+#include <sys/types.h>
 
 
 /**
diff --git a/src/player.c b/src/player.c
index 91211c6..643b002 100644
--- a/src/player.c
+++ b/src/player.c
@@ -4,7 +4,7 @@
  * @brief Contains all the player related stuff.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "lephisto.h"
 #include "pilot.h"
diff --git a/src/space.c b/src/space.c
index d22b5ce..e073182 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
 #include <math.h>
 
 #include "xml.h"
diff --git a/src/unidiff.c b/src/unidiff.c
index 47c1ecd..66597d5 100644
--- a/src/unidiff.c
+++ b/src/unidiff.c
@@ -8,7 +8,7 @@
  * through missions.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "lephisto.h"
diff --git a/src/weapon.c b/src/weapon.c
index 18d53ec..1ab8b5a 100644
--- a/src/weapon.c
+++ b/src/weapon.c
@@ -8,7 +8,7 @@
  */
 
 #include <math.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "outfit.h"
diff --git a/utils/mkspr/main.c b/utils/mkspr/main.c
index 41be479..14dec75 100644
--- a/utils/mkspr/main.c
+++ b/utils/mkspr/main.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <png.h>
 
 #include <SDL/SDL.h>