Sanitized some video code to avoid #include's inside headers, and added guards to include/86box/thread.h.

src/include/86box/thread.h

@@ -1,3 +1,24 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Thread API header.
+ *
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
+ *          Miran Grca, <mgrca8@gmail.com>
+ *
+ *          Copyright 2008-2023 Sarah Walker.
+ *          Copyright 2016-2023 Miran Grca.
+ */
+#ifndef THREAD_H
+#    define THREAD_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -44,3 +65,5 @@ extern int      thread_release_mutex(mutex_t *mutex);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /*THREAD_H*/

src/include/86box/vid_8514a.h

@@ -15,7 +15,6 @@
  *
  *          Copyright 2022 TheCollector1995.
  */
-
 #ifndef VIDEO_8514A_H
 #define VIDEO_8514A_H
 
@@ -203,4 +202,5 @@ typedef struct ibm8514_t {
     int      ext_pitch;
     int      ext_crt_pitch;
 } ibm8514_t;
+
 #endif /*VIDEO_8514A_H*/

src/include/86box/vid_svga.h

@@ -16,11 +16,6 @@
  *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
  */
-
-#include <86box/thread.h>
-#include <86box/vid_8514a.h>
-#include <86box/vid_xga.h>
-
 #ifndef VIDEO_SVGA_H
 #    define VIDEO_SVGA_H
 
@@ -58,8 +53,6 @@ typedef union {
 } latch_t;
 
 typedef struct svga_t {
-    ibm8514_t     dev8514;
-    xga_t         xga;
     mem_mapping_t mapping;
 
     uint8_t fast;
@@ -269,11 +262,14 @@ typedef struct svga_t {
 
     /* Pointer to monitor */
     monitor_t *monitor;
+
+    void *  dev8514;
+    void *  xga;
 } svga_t;
 
 extern int vga_on;
 
-extern void    ibm8514_poll(ibm8514_t *dev, svga_t *svga);
+extern void    ibm8514_poll(void *priv, svga_t *svga);
 extern void    ibm8514_recalctimings(svga_t *svga);
 extern uint8_t ibm8514_ramdac_in(uint16_t port, void *priv);
 extern void    ibm8514_ramdac_out(uint16_t port, uint8_t val, void *priv);
@@ -283,7 +279,7 @@ extern void    ibm8514_accel_out_pixtrans(svga_t *svga, uint16_t port, uint16_t
 extern void    ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, uint8_t ssv, int len);
 extern void    ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, int len);
 
-extern void xga_poll(xga_t *xga, svga_t *svga);
+extern void xga_poll(void *priv, svga_t *svga);
 extern void xga_recalctimings(svga_t *svga);
 
 extern int  svga_init(const device_t *info, svga_t *svga, void *priv, int memsize,

src/include/86box/vid_xga.h

@@ -14,7 +14,6 @@
  *
  *          Copyright 2022 TheCollector1995.
  */
-
 #ifndef VIDEO_XGA_H
 #define VIDEO_XGA_H
 
@@ -232,4 +231,5 @@ typedef struct xga_t {
 
     int big_endian_linear;
 } xga_t;
+
 #endif /*VIDEO_XGA_H*/