diff --git a/gfx/common/fpga_common.h b/gfx/common/fpga_common.h
deleted file mode 100644
index 61519425a1..0000000000
--- a/gfx/common/fpga_common.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  copyright (c) 2011-2017 - Daniel De Matteis
- *  copyright (c) 2016-2017 - Brad Parker
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __FPGA_COMMON_H
-#define __FPGA_COMMON_H
-
-#define NUMBER_OF_WRITE_FRAMES 1 /* XPAR_AXIVDMA_0_NUM_FSTORES */
-#define STORAGE_SIZE NUMBER_OF_WRITE_FRAMES * ((1920*1080)<<2)
-#define FRAME_SIZE (STORAGE_SIZE / NUMBER_OF_WRITE_FRAMES)
-
-#define FB_WIDTH 1920
-#define FB_HEIGHT 1080
-
-typedef struct RegOp
-{
-   int fd;
-   void *ptr;
-   int only_mmap;
-   int only_munmap;
-} RegOp;
-
-typedef struct fpga
-{
-   bool rgb32;
-   unsigned menu_width;
-   unsigned menu_height;
-   unsigned menu_pitch;
-   unsigned video_width;
-   unsigned video_height;
-   unsigned video_pitch;
-   unsigned video_bits;
-   unsigned menu_bits;
-
-   RegOp regOp;
-   volatile unsigned *framebuffer;
-   unsigned char *menu_frame;
-} fpga_t;
-
-#endif
diff --git a/gfx/common/network_common.h b/gfx/common/network_common.h
deleted file mode 100644
index 4de779287d..0000000000
--- a/gfx/common/network_common.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  copyright (c) 2011-2017 - Daniel De Matteis
- *  copyright (c) 2016-2019 - Brad Parker
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __NETWORK_VIDEO_COMMON_H
-#define __NETWORK_VIDEO_COMMON_H
-
-typedef struct network
-{
-   unsigned video_width;
-   unsigned video_height;
-   unsigned screen_width;
-   unsigned screen_height;
-   char address[256];
-   uint16_t port;
-   int fd;
-} network_video_t;
-
-#endif
diff --git a/gfx/common/vita_common.h b/gfx/common/vita_common.h
deleted file mode 100644
index 9036a69f42..0000000000
--- a/gfx/common/vita_common.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef VITA_COMMON_H__
-#define VITA_COMMON_H__
-
-#include "../deps/Pigs-In-A-Blanket/include/pib.h"
-
-#ifdef HAVE_EGL
-#include "../common/egl_common.h"
-#endif
-
-#define ATTR_VITA_WIDTH 960
-#define ATTR_VITA_HEIGHT 544
-
-typedef struct
-{
-#ifdef HAVE_EGL
-   egl_ctx_data_t egl;
-#endif
-   int native_window;
-   bool resize;
-   unsigned width, height;
-   float refresh_rate;
-} vita_ctx_data_t;
-
-#endif
diff --git a/gfx/drivers/fpga_gfx.c b/gfx/drivers/fpga_gfx.c
index 95a64ac96c..0416cb9a2e 100644
--- a/gfx/drivers/fpga_gfx.c
+++ b/gfx/drivers/fpga_gfx.c
@@ -32,8 +32,38 @@
 #include "../../driver.h"
 #include "../../configuration.h"
 #include "../../verbosity.h"
-#include "../common/fpga_common.h"
 
+#define NUMBER_OF_WRITE_FRAMES 1 /* XPAR_AXIVDMA_0_NUM_FSTORES */
+#define STORAGE_SIZE NUMBER_OF_WRITE_FRAMES * ((1920*1080)<<2)
+#define FRAME_SIZE (STORAGE_SIZE / NUMBER_OF_WRITE_FRAMES)
+
+#define FB_WIDTH  1920
+#define FB_HEIGHT 1080
+
+typedef struct RegOp
+{
+   int fd;
+   void *ptr;
+   int only_mmap;
+   int only_munmap;
+} RegOp;
+
+typedef struct fpga
+{
+   bool rgb32;
+   unsigned menu_width;
+   unsigned menu_height;
+   unsigned menu_pitch;
+   unsigned video_width;
+   unsigned video_height;
+   unsigned video_pitch;
+   unsigned video_bits;
+   unsigned menu_bits;
+
+   RegOp regOp;
+   volatile unsigned *framebuffer;
+   unsigned char *menu_frame;
+} fpga_t;
 
 static unsigned int get_memory_size(void)
 {
@@ -121,8 +151,6 @@ static void *fpga_gfx_init(const video_info_t *video,
 
    fpga_gfx_create(fpga);
 
-   RARCH_LOG("[FPGA]: Init complete.\n");
-
    return fpga;
 
 error:
@@ -240,22 +268,19 @@ static bool fpga_gfx_frame(void *data, const void *frame,
             }
          }
       }
+#if 0
       else
       {
          /* TODO/FIXME: handle 32-bit core output */
       }
+#endif
    }
 
    return true;
 }
 
 static void fpga_gfx_set_nonblock_state(void *a, bool b, bool c, unsigned d) { }
-
-static bool fpga_gfx_alive(void *data)
-{
-   return true;
-}
-
+static bool fpga_gfx_alive(void *data) { return true; }
 static bool fpga_gfx_focus(void *data) { return true; }
 static bool fpga_gfx_suppress_screensaver(void *data, bool enable) { return false; }
 static bool fpga_gfx_has_windowed(void *data) { return true; }
@@ -279,22 +304,11 @@ static void fpga_gfx_free(void *data)
    do_mmap_op(&fpga->regOp);
 }
 
+/* TODO/FIXME - implement */
 static bool fpga_gfx_set_shader(void *data,
-      enum rarch_shader_type type, const char *path)
-{
-   (void)data;
-   (void)type;
-   (void)path;
-
-   return false;
-}
-
+      enum rarch_shader_type type, const char *path) { return false; }
 static void fpga_gfx_set_rotation(void *data,
-      unsigned rotation)
-{
-   (void)data;
-   (void)rotation;
-}
+      unsigned rotation) { }
 
 static void fpga_set_texture_frame(void *data,
       const void *frame, bool rgb32, unsigned width, unsigned height,
@@ -327,21 +341,16 @@ static void fpga_set_texture_frame(void *data,
    }
 }
 
+/* TODO/FIXME - implement */
 static void fpga_set_osd_msg(void *data, 
       const char *msg,
-      const void *params, void *font)
-{
-}
-
+      const void *params, void *font) { }
 static void fpga_get_video_output_size(void *data,
       unsigned *width, unsigned *height, char *desc, size_t desc_len) { }
 static void fpga_get_video_output_prev(void *data) { }
 static void fpga_get_video_output_next(void *data) { }
-
 static void fpga_set_video_mode(void *data, unsigned width, unsigned height,
-      bool fullscreen)
-{
-}
+      bool fullscreen) { }
 
 static const video_poke_interface_t fpga_poke_interface = {
    NULL,
@@ -384,10 +393,9 @@ static void fpga_gfx_get_poke_interface(void *data,
    *iface = &fpga_poke_interface;
 }
 
+/* TODO/FIXME - implement */
 static void fpga_gfx_set_viewport(void *data, unsigned viewport_width,
-      unsigned viewport_height, bool force_full, bool allow_rotate)
-{
-}
+      unsigned viewport_height, bool force_full, bool allow_rotate) { }
 
 video_driver_t video_fpga = {
    fpga_gfx_init,
diff --git a/gfx/drivers/network_gfx.c b/gfx/drivers/network_gfx.c
index e1543332b1..9eac670417 100644
--- a/gfx/drivers/network_gfx.c
+++ b/gfx/drivers/network_gfx.c
@@ -37,20 +37,30 @@
 
 #include "../../driver.h"
 #include "../../configuration.h"
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../frontend/frontend_driver.h"
-#include "../common/network_common.h"
 
 #define xstr(s) str(s)
 #define str(s) #s
 
-enum {
+enum
+{
    NETWORK_VIDEO_PIXELFORMAT_RGBA8888 = 0,
    NETWORK_VIDEO_PIXELFORMAT_BGRA8888,
    NETWORK_VIDEO_PIXELFORMAT_RGB565
 } network_video_pixelformat;
 
+typedef struct network
+{
+   unsigned video_width;
+   unsigned video_height;
+   unsigned screen_width;
+   unsigned screen_height;
+   char address[256];
+   uint16_t port;
+   int fd;
+} network_video_t;
+
 static unsigned char *network_menu_frame = NULL;
 static unsigned network_menu_width       = 0;
 static unsigned network_menu_height      = 0;
diff --git a/gfx/drivers_context/vita_ctx.c b/gfx/drivers_context/vita_ctx.c
index c21d25ce6b..391dd85ed4 100644
--- a/gfx/drivers_context/vita_ctx.c
+++ b/gfx/drivers_context/vita_ctx.c
@@ -16,8 +16,25 @@
 
 /* Vita context. */
 
+#include "../../deps/Pigs-In-A-Blanket/include/pib.h"
 #include "../../retroarch.h"
-#include "../common/vita_common.h"
+#ifdef HAVE_EGL
+#include "../common/egl_common.h"
+#endif
+
+#define ATTR_VITA_WIDTH 960
+#define ATTR_VITA_HEIGHT 544
+
+typedef struct
+{
+#ifdef HAVE_EGL
+   egl_ctx_data_t egl;
+#endif
+   int native_window;
+   bool resize;
+   unsigned width, height;
+   float refresh_rate;
+} vita_ctx_data_t;
 
 static void vita_swap_interval(void *data, int interval)
 {