From aa53519bcd5b716306e0fb0ec2a89d953128bc85 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Mon, 30 May 2016 21:21:09 +0100
Subject: [PATCH] fix missing includes from header API changes

---
 desktop/plot_style.h         | 2 +-
 frontends/atari/plot/plot.h  | 6 ++++--
 frontends/framebuffer/fbtk.h | 2 ++
 frontends/windows/drawable.c | 7 ++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/desktop/plot_style.h b/desktop/plot_style.h
index af54e79cb..347c6e836 100644
--- a/desktop/plot_style.h
+++ b/desktop/plot_style.h
@@ -113,7 +113,7 @@ typedef enum {
 /**
  * Plot style for stroke/fill plotters
  */
-typedef struct {
+typedef struct plot_style_s {
 	plot_operation_type_t stroke_type; /**< Stroke plot type */
 	int stroke_width; /**< Width of stroke, in pixels */
 	colour stroke_colour; /**< Colour of stroke */
diff --git a/frontends/atari/plot/plot.h b/frontends/atari/plot/plot.h
index 22f8781c2..fd73a8c33 100644
--- a/frontends/atari/plot/plot.h
+++ b/frontends/atari/plot/plot.h
@@ -54,6 +54,8 @@
 #define ERR_NO_MEM 2			/* Not enough memory for requested operation */
 #define ERR_PLOTTER_NOT_AVAILABLE 3	/* invalid plotter driver name passed */
 
+struct plot_style_s;
+
 struct s_vdi_sysinfo {
 	short vdi_handle;          /**< vdi handle */
 	short scr_w;		   /**< resolution horz. */
@@ -104,8 +106,8 @@ void plot_get_clip_grect(GRECT * out);
 bool plot_clip(const struct rect *clip);
 VdiHdl plot_get_vdi_handle(void);
 long plot_get_flags(void);
-bool plot_rectangle( int x0, int y0, int x1, int y1,const plot_style_t *style );
-bool plot_line( int x0, int y0, int x1, int y1, const plot_style_t *style );
+bool plot_rectangle( int x0, int y0, int x1, int y1,const struct plot_style_s *style );
+bool plot_line( int x0, int y0, int x1, int y1, const struct plot_style_s *style );
 bool plot_blit_bitmap(struct bitmap * bmp, int x, int y,
                       unsigned long bg, unsigned long flags);
 bool plot_blit_mfdb(GRECT * loc, MFDB * insrc, short fgcolor, uint32_t flags);
diff --git a/frontends/framebuffer/fbtk.h b/frontends/framebuffer/fbtk.h
index 6ad06edff..fe4f5a564 100644
--- a/frontends/framebuffer/fbtk.h
+++ b/frontends/framebuffer/fbtk.h
@@ -19,6 +19,8 @@
 #ifndef NETSURF_FB_FBTK_H
 #define NETSURF_FB_FBTK_H
 
+#include "desktop/plot_style.h"
+
 #ifdef FBTK_LOGGING
 #define FBTK_LOG(x) LOG(x)
 #else
diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c
index 39ecee092..74aca1562 100644
--- a/frontends/windows/drawable.c
+++ b/frontends/windows/drawable.c
@@ -17,18 +17,19 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 
 #include "utils/config.h"
 
 #include <windows.h>
 #include <windowsx.h>
 
-#include "netsurf/browser_window.h"
-#include "desktop/textinput.h"
-#include "netsurf/plotters.h"
 #include "utils/errors.h"
 #include "utils/log.h"
 #include "utils/utils.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/plotters.h"
+#include "desktop/textinput.h"
 
 #include "windows/windbg.h"
 #include "windows/plot.h"