diff --git a/audio/drivers/psp_audio.c b/audio/drivers/psp_audio.c
index d3fa1f27d3..27ddec535b 100644
--- a/audio/drivers/psp_audio.c
+++ b/audio/drivers/psp_audio.c
@@ -18,6 +18,7 @@
 #include <stdint.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <string.h>
 
 #ifdef VITA
 #include <psp2/kernel/processmgr.h>
diff --git a/bootstrap/vita/sbrk.c b/bootstrap/vita/sbrk.c
index ee47f8def9..051cae86b7 100644
--- a/bootstrap/vita/sbrk.c
+++ b/bootstrap/vita/sbrk.c
@@ -1,6 +1,9 @@
 #include <errno.h>
 #include <reent.h>
 #include "../../defines/psp_defines.h"
+#include <psp2/kernel/sysmem.h>
+#include <psp2/kernel/threadmgr.h>
+
 static int _newlib_heap_memblock;
 static unsigned _newlib_heap_size;
 static char *_newlib_heap_base, *_newlib_heap_end, *_newlib_heap_cur;
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 27979d3e06..47b2f709d8 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -18,10 +18,17 @@
 #include <stddef.h>
 #include <string.h>
 
+#include "retroarch.h"
+#include "paths.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
+
 #ifdef VITA
 #include <psp2/power.h>
 #include <psp2/sysmodule.h>
@@ -38,6 +45,7 @@
 #include <pspsdk.h>
 #endif
 
+#include <string/stdstring.h>
 #include <boolean.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
diff --git a/gfx/common/vita2d_common.h b/gfx/common/vita2d_common.h
index 30a9e2f8ea..8d0153a427 100644
--- a/gfx/common/vita2d_common.h
+++ b/gfx/common/vita2d_common.h
@@ -21,9 +21,11 @@
 
 #include <retro_inline.h>
 #include <string/stdstring.h>
+#include <gfx/math/matrix_4x4.h>
 
 #include "../../defines/psp_defines.h"
 #include "../../driver.h"
+#include "../video_driver.h"
 #include "../video_coord_array.h"
 
 typedef struct vita_menu_frame
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index d647b542ce..ed2804e37f 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -16,8 +16,12 @@
 
 #include <vita2d.h>
 
+#include <verbosity.h>
+#include <configuration.h>
+
 #include <retro_inline.h>
 #include <string/stdstring.h>
+#include <formats/image.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -27,11 +31,13 @@
 #include "../../menu/menu_driver.h"
 #endif
 
-#include "../../defines/psp_defines.h"
 #include "../common/vita2d_common.h"
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../video_coord_array.h"
+#include "../video_context_driver.h"
+
+#include "../../defines/psp_defines.h"
 
 extern void *memcpy_neon(void *dst, const void *src, size_t n);
 
diff --git a/gfx/drivers_font/vita2d_font.c b/gfx/drivers_font/vita2d_font.c
index 0069501abc..c02ebcb020 100644
--- a/gfx/drivers_font/vita2d_font.c
+++ b/gfx/drivers_font/vita2d_font.c
@@ -17,6 +17,9 @@
 #include <vita2d.h>
 
 #include <encodings/utf.h>
+#include <verbosity.h>
+
+#include "../common/vita2d_common.h"
 
 #include "../font_driver.h"
 
diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c
index f6e0bef4d3..9658a5b7e2 100644
--- a/input/drivers/psp_input.c
+++ b/input/drivers/psp_input.c
@@ -33,6 +33,7 @@
 
 #include <boolean.h>
 #include <libretro.h>
+#include <retro_miscellaneous.h>
 
 #ifdef HAVE_KERNEL_PRX
 #include "../../bootstrap/psp1/kernel_functions.h"
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
index c904b0b020..d48ede2a1e 100644
--- a/input/drivers_joypad/psp_joypad.c
+++ b/input/drivers_joypad/psp_joypad.c
@@ -15,13 +15,23 @@
  */
 
 #include <stdint.h>
+#include <string.h>
+
+#include <input/input_config.h>
 
 #include "../../tasks/tasks_internal.h"
 
 #include "../../configuration.h"
 
+#include "../../defines/psp_defines.h"
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
+
 #if defined(VITA)
 #include <psp2/kernel/sysmem.h>
+#include <psp2/ctrl.h>
 #include <psp2/touch.h>
 #define PSP_MAX_PADS 4
 static int psp2_model;
diff --git a/libretro-common/include/net/net_compat.h b/libretro-common/include/net/net_compat.h
index 76c9c51df2..32d73aa241 100644
--- a/libretro-common/include/net/net_compat.h
+++ b/libretro-common/include/net/net_compat.h
@@ -101,6 +101,8 @@ struct hostent
 	char *h_addr;
 };
 
+struct SceNetInAddr inet_aton(const char *ip_addr);
+
 #else
 #include <sys/select.h>
 #include <sys/types.h>
diff --git a/libretro-common/net/net_socket.c b/libretro-common/net/net_socket.c
index 6d0cfdf700..73c697335a 100644
--- a/libretro-common/net/net_socket.c
+++ b/libretro-common/net/net_socket.c
@@ -142,6 +142,7 @@ int socket_select(int nfds, fd_set *readfs, fd_set *writefds,
 #if defined(__CELLOS_LV2__)
    return socketselect(nfds, readfs, writefds, errorfds, timeout);
 #elif defined(VITA)
+   extern int retro_epoll_fd;
    SceNetEpollEvent ev = {0};
 
    ev.events = SCE_NET_EPOLLIN | SCE_NET_EPOLLHUP;