Merge branch 'master' of https://github.com/86Box/86Box

README.md

@@ -44,7 +44,7 @@ guide:
 7. If the compilation succeeded (which it almost always should), you will find
    `86Box.exe` in the src directory.
 8. In order to test your fresh build, replace the `86Box.exe` in your current
-   86Box enviroment with your freshly built one. If you do not have a
+   86Box environment with your freshly built one. If you do not have a
    pre-existing 86Box environment, download the latest successful build from
    http://ci.86box.net, and the latest ROM set from https://github.com/86Box/roms.
 9. Enjoy using and testing the emulator! :)

src/apm.c

@@ -21,11 +21,11 @@
 #include <string.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "device.h"
-#include "86box_io.h"
-#include "apm.h"
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/apm.h>
 
 
 #ifdef ENABLE_APM_LOG

src/bugger.c

@@ -55,12 +55,12 @@
 #include <string.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "86box_io.h"
-#include "device.h"
-#include "plat.h"
-#include "ui.h"
-#include "bugger.h"
+#include <86box/86box.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/plat.h>
+#include <86box/ui.h>
+#include <86box/bugger.h>
 
 
 /* BugBugger registers. */

src/cdrom/cdrom.c

@@ -22,12 +22,12 @@
 #include <stdlib.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "config.h"
-#include "cdrom.h"
-#include "cdrom_image.h"
-#include "plat.h"
-#include "sound.h"
+#include <86box/86box.h>
+#include <86box/config.h>
+#include <86box/cdrom.h>
+#include <86box/cdrom_image.h>
+#include <86box/plat.h>
+#include <86box/sound.h>
 
 
 /* The addresses sent from the guest are absolute, ie. a LBA of 0 corresponds to a MSF of 00:00:00. Otherwise, the counter displayed by the guest is wrong:

src/cdrom/cdrom_image.c

@@ -29,13 +29,13 @@
 #include <stdlib.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "config.h"
-#include "plat.h"
-#include "scsi_device.h"
-#include "cdrom_image_backend.h"
-#include "cdrom.h"
-#include "cdrom_image.h"
+#include <86box/86box.h>
+#include <86box/config.h>
+#include <86box/plat.h>
+#include <86box/scsi_device.h>
+#include <86box/cdrom_image_backend.h>
+#include <86box/cdrom.h>
+#include <86box/cdrom_image.h>
 
 
 #ifdef ENABLE_CDROM_IMAGE_LOG

src/cdrom/cdrom_image_backend.c

@@ -35,9 +35,9 @@
 #endif
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "plat.h"
-#include "cdrom_image_backend.h"
+#include <86box/86box.h>
+#include <86box/plat.h>
+#include <86box/cdrom_image_backend.h>
 
 
 #define CDROM_BCD(x)      (((x) % 10) | (((x) / 10) << 4))

src/chipset/acc2168.c

@@ -20,19 +20,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
-#include "device.h"
-#include "keyboard.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "mouse.h"
-#include "port_92.h"
-#include "sio.h"
-#include "hdc.h"
-#include "video.h"
-#include "chipset.h"
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/mouse.h>
+#include <86box/port_92.h>
+#include <86box/sio.h>
+#include <86box/hdc.h>
+#include <86box/video.h>
+#include <86box/chipset.h>
 
 
 typedef struct acc2168_t

src/chipset/acer_m3a.c

@@ -20,14 +20,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "mem.h"
-#include "86box_io.h"
-#include "rom.h"
-#include "pci.h"
-#include "device.h"
-#include "keyboard.h"
-#include "chipset.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/chipset.h>
 
 
 typedef struct

src/chipset/ali1429.c

@@ -21,20 +21,20 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "device.h"
-#include "keyboard.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "hdc.h"
-#include "hdc_ide.h"
-#include "timer.h"
-#include "port_92.h"
-#include "chipset.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/timer.h>
+#include <86box/port_92.h>
+#include <86box/chipset.h>
 
 
 typedef struct

src/chipset/cs8230.c

@@ -19,15 +19,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
-#include "86box_io.h"
-#include "device.h"
-#include "mem.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "chipset.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/chipset.h>
 
 
 static struct

src/chipset/headland.c

@@ -25,19 +25,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
-#include "timer.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "rom.h"
-#include "device.h"
-#include "keyboard.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "port_92.h"
-#include "chipset.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/port_92.h>
+#include <86box/chipset.h>
 
 
 typedef struct {

src/chipset/intel_4x0.c

@@ -20,15 +20,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
-#include "86box_io.h"
-#include "rom.h"
-#include "pci.h"
-#include "device.h"
-#include "keyboard.h"
-#include "chipset.h"
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/chipset.h>
 
 
 enum

src/chipset/neat.c

@@ -24,16 +24,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "device.h"
-#include "timer.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "keyboard.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "chipset.h"
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/keyboard.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/chipset.h>
 
 #define NEAT_DEBUG	0
 

src/chipset/opti495.c

@@ -258,16 +258,16 @@ SeeAlso: #P0178,#P0187
 #include <string.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
-#include "86box_io.h"
-#include "device.h"
-#include "keyboard.h"
-#include "mem.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "chipset.h"
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/chipset.h>
 
 
 typedef struct

src/chipset/scamp.c

@@ -24,15 +24,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
-#include "device.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "port_92.h"
-#include "chipset.h"
+#include <86box/timer.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/port_92.h>
+#include <86box/chipset.h>
 
 typedef struct {
 	void *parent;

src/chipset/scat.c

@@ -23,20 +23,20 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "device.h"
+#include <86box/86box.h>
+#include <86box/device.h>
 #include "cpu.h"
 #include "x86.h"
-#include "timer.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "keyboard.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "port_92.h"
-#include "rom.h"
-#include "chipset.h"
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/keyboard.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/port_92.h>
+#include <86box/rom.h>
+#include <86box/chipset.h>
 
 
 #define SCAT_DMA_WAIT_STATE_CONTROL 0x01

src/chipset/sis_85c471.c

@@ -22,21 +22,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
-#include "86box_io.h"
-#include "lpt.h"
-#include "rom.h"
-#include "pci.h"
-#include "device.h"
-#include "hdc_ide.h"
-#include "keyboard.h"
-#include "timer.h"
-#include "port_92.h"
-#include "serial.h"
-#include "machine.h"
-#include "chipset.h"
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/lpt.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/hdc_ide.h>
+#include <86box/keyboard.h>
+#include <86box/timer.h>
+#include <86box/port_92.h>
+#include <86box/serial.h>
+#include <86box/machine.h>
+#include <86box/chipset.h>
 
 
 typedef struct {

src/chipset/sis_85c496.c

@@ -21,19 +21,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
-#include "86box_io.h"
-#include "rom.h"
-#include "pci.h"
-#include "device.h"
-#include "keyboard.h"
-#include "timer.h"
-#include "port_92.h"
-#include "hdc_ide.h"
-#include "machine.h"
-#include "chipset.h"
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/timer.h>
+#include <86box/port_92.h>
+#include <86box/hdc_ide.h>
+#include <86box/machine.h>
+#include <86box/chipset.h>
 
 
 typedef struct sis_85c496_t

src/chipset/sis_85c50x.c

@@ -20,15 +20,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "mem.h"
-#include "86box_io.h"
-#include "rom.h"
-#include "pci.h"
-#include "device.h"
-#include "keyboard.h"
-#include "port_92.h"
-#include "chipset.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/port_92.h>
+#include <86box/chipset.h>
 
 
 typedef struct sis_85c501_t

src/chipset/via_apro.c

@@ -28,14 +28,14 @@ just like the Intel 4x0 series.
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "mem.h"
-#include "86box_io.h"
-#include "rom.h"
-#include "pci.h"
-#include "device.h"
-#include "keyboard.h"
-#include "chipset.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/chipset.h>
 
 typedef struct via_apro_t
 {

src/chipset/via_mvp3.c

@@ -21,14 +21,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "mem.h"
-#include "86box_io.h"
-#include "rom.h"
-#include "pci.h"
-#include "device.h"
-#include "keyboard.h"
-#include "chipset.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
+#include <86box/io.h>
+#include <86box/rom.h>
+#include <86box/pci.h>
+#include <86box/device.h>
+#include <86box/keyboard.h>
+#include <86box/chipset.h>
 
 
 typedef struct via_mvp3_t

src/chipset/wd76c10.c

@@ -23,18 +23,18 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "device.h"
-#include "timer.h"
-#include "86box_io.h"
-#include "keyboard.h"
-#include "mem.h"
-#include "port_92.h"
-#include "serial.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "video.h"
-#include "chipset.h"
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/keyboard.h>
+#include <86box/mem.h>
+#include <86box/port_92.h>
+#include <86box/serial.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/video.h>
+#include <86box/chipset.h>
 
 
 typedef struct {

src/config.c

@@ -33,35 +33,35 @@
 #include <stdlib.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "device.h"
-#include "timer.h"
-#include "nvr.h"
-#include "config.h"
-#include "isamem.h"
-#include "isartc.h"
-#include "lpt.h"
-#include "hdd.h"
-#include "hdc.h"
-#include "hdc_ide.h"
-#include "fdd.h"
-#include "fdc.h"
-#include "gameport.h"
-#include "machine.h"
-#include "mouse.h"
-#include "network.h"
-#include "scsi.h"
-#include "scsi_device.h"
-#include "cdrom.h"
-#include "zip.h"
-#include "sound.h"
-#include "midi.h"
-#include "snd_mpu401.h"
-#include "video.h"
-#include "plat.h"
-#include "plat_midi.h"
-#include "ui.h"
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/nvr.h>
+#include <86box/config.h>
+#include <86box/isamem.h>
+#include <86box/isartc.h>
+#include <86box/lpt.h>
+#include <86box/hdd.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/gameport.h>
+#include <86box/machine.h>
+#include <86box/mouse.h>
+#include <86box/network.h>
+#include <86box/scsi.h>
+#include <86box/scsi_device.h>
+#include <86box/cdrom.h>
+#include <86box/zip.h>
+#include <86box/sound.h>
+#include <86box/midi.h>
+#include <86box/snd_mpu401.h>
+#include <86box/video.h>
+#include <86box/plat.h>
+#include <86box/plat_midi.h>
+#include <86box/ui.h>
 
 
 typedef struct _list_ {

src/cpu/codegen.c

@@ -3,8 +3,8 @@
 #include <string.h>
 #include <wchar.h>
 
-#include "86box.h"
-#include "mem.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
 #include "cpu.h"
 #include "x86_ops.h"
 #include "codegen.h"

src/cpu/codegen.h

@@ -37,7 +37,7 @@
 #ifndef _CODEGEN_H_
 #define _CODEGEN_H_
 
-#include "../mem.h"
+#include <86box/mem.h>
 #include "../cpu_common/x86_ops.h"
 
 #ifdef __amd64__

src/cpu/codegen_ops.c

@@ -3,8 +3,8 @@
 #include <string.h>
 #include <wchar.h>
 
-#include "86box.h"
-#include "mem.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"

src/cpu/codegen_timing_486.c

@@ -2,8 +2,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "mem.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"

src/cpu/codegen_timing_686.c

@@ -12,8 +12,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "mem.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"

src/cpu/codegen_timing_common.c

@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "codegen_timing_common.h"
 

src/cpu/codegen_timing_pentium.c

@@ -13,8 +13,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
-#include "mem.h"
+#include <86box/86box.h>
+#include <86box/mem.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"

src/cpu/codegen_timing_winchip.c

@@ -2,12 +2,12 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "../mem.h"
+#include <86box/mem.h>
 #include "codegen.h"
 #include "codegen_ops.h"
 #include "codegen_timing_common.h"

src/cpu/codegen_x86-64.c

@@ -5,13 +5,13 @@
 #include <stdint.h>
 #include <stdlib.h>
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_flags.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "386_common.h"
 

src/cpu/codegen_x86.c

@@ -43,9 +43,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 #include "x86.h"
 #include "x86_flags.h"
 #include "../cpu_common/x86_ops.h"

src/cpu/x86seg.c

@@ -24,13 +24,13 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "device.h"
-#include "timer.h"
-#include "machine.h"
-#include "mem.h"
-#include "nvr.h"
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/machine.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
 #include "x86.h"
 #include "x86_flags.h"
 #include "386_common.h"

src/cpu_common/386.c

@@ -10,17 +10,17 @@
 #endif
 
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
+#include <86box/timer.h>
 #include "x86.h"
 #include "x87.h"
-#include "nmi.h"
-#include "mem.h"
-#include "pic.h"
-#include "pit.h"
-#include "fdd.h"
-#include "fdc.h"
+#include <86box/nmi.h>
+#include <86box/mem.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
 #include "386_common.h"
 #ifdef USE_NEW_DYNAREC
 #include "codegen.h"

src/cpu_common/386_common.c

@@ -9,17 +9,17 @@
 # define INFINITY   (__builtin_inff())
 #endif
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
+#include <86box/timer.h>
 #include "x86.h"
 #include "x87.h"
-#include "nmi.h"
-#include "mem.h"
-#include "pic.h"
-#include "pit.h"
-#include "fdd.h"
-#include "fdc.h"
+#include <86box/nmi.h>
+#include <86box/mem.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
 #include "386_common.h"
 #include "x86_flags.h"
 #include "codegen.h"

src/cpu_common/386_dynarec - Cópia (2).c

@@ -10,18 +10,18 @@
 #endif
 
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "pic.h"
-#include "timer.h"
-#include "fdd.h"
-#include "fdc.h"
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
 #ifdef USE_DYNAREC
 #include "codegen.h"
 #ifdef USE_NEW_DYNAREC

src/cpu_common/386_dynarec - Cópia.c

@@ -10,18 +10,18 @@
 #endif
 
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "pic.h"
-#include "timer.h"
-#include "fdd.h"
-#include "fdc.h"
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
 #ifdef USE_DYNAREC
 #include "codegen.h"
 #ifdef USE_NEW_DYNAREC

src/cpu_common/386_dynarec.c

@@ -10,18 +10,18 @@
 #endif
 
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "pic.h"
-#include "timer.h"
-#include "fdd.h"
-#include "fdc.h"
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
 #ifdef USE_DYNAREC
 #include "codegen.h"
 #ifdef USE_NEW_DYNAREC

src/cpu_common/386_dynarec.c.temp

@@ -10,18 +10,18 @@
 #endif
 
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "pic.h"
-#include "timer.h"
-#include "fdd.h"
-#include "fdc.h"
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
+#include <86box/timer.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
 #ifdef USE_DYNAREC
 #include "codegen.h"
 #ifdef USE_NEW_DYNAREC

src/cpu_common/386_dynarec_ops.c

@@ -8,17 +8,17 @@
 # define INFINITY   (__builtin_inff())
 #endif
 
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "timer.h"
+#include <86box/timer.h>
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
 #include "x86_flags.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "nmi.h"
-#include "pic.h"
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
 #include "codegen.h"
 
 #define CPU_BLOCK_END() cpu_block_end = 1

src/cpu_common/808x.c

@@ -25,16 +25,16 @@
 #include <wchar.h>
 
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
-#include "machine.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "rom.h"
-#include "nmi.h"
-#include "pic.h"
-#include "timer.h"
+#include <86box/machine.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/rom.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
+#include <86box/timer.h>
 
 /* The opcode of the instruction currently being executed. */
 uint8_t opcode;

src/cpu_common/cpu.c

@@ -43,16 +43,16 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "device.h"
-#include "machine.h"
-#include "86box_io.h"
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/io.h>
 #include "x86_ops.h"
-#include "mem.h"
-#include "nmi.h"
-#include "pic.h"
-#include "pci.h"
+#include <86box/mem.h>
+#include <86box/nmi.h>
+#include <86box/pic.h>
+#include <86box/pci.h>
 #ifdef USE_DYNAREC
 # include "codegen.h"
 #endif

src/cpu_common/cpu_table - Cópia.c

@@ -45,9 +45,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "machine.h"
+#include <86box/machine.h>
 
 
 CPU cpus_8088[] = {

src/cpu_common/cpu_table.c

@@ -45,9 +45,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "machine.h"
+#include <86box/machine.h>
 
 
 CPU cpus_8088[] = {

src/cpu_common/x87.c

@@ -6,10 +6,10 @@
 #define fplog 0
 #include <math.h>
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
-#include "pic.h"
+#include <86box/mem.h>
+#include <86box/pic.h>
 #include "x86.h"
 #include "x86_flags.h"
 #include "x86_ops.h"

src/cpu_new/codegen.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86_ops.h"
 #include "codegen.h"

src/cpu_new/codegen.h

@@ -1,7 +1,7 @@
 #ifndef _CODEGEN_H_
 #define _CODEGEN_H_
 
-#include "mem.h"
+#include <86box/mem.h>
 #include "../cpu_common/x86_ops.h"
 
 /*Handling self-modifying code (of which there is a lot on x86) :

src/cpu_new/codegen_accumulate.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/cpu_new/codegen_allocator.c

@@ -9,9 +9,9 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_arm.c

@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_arm64.c

@@ -2,9 +2,9 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_arm64_ops.c

@@ -1,9 +1,9 @@
 #ifdef __aarch64__
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_arm64_uops.c

@@ -1,9 +1,9 @@
 #ifdef __aarch64__
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x87.h"

src/cpu_new/codegen_backend_arm_ops.c

@@ -1,9 +1,9 @@
 #ifdef __ARM_EABI__
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_arm_uops.c

@@ -2,9 +2,9 @@
 
 #include <math.h>
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x87.h"

src/cpu_new/codegen_backend_x86-64.c

@@ -1,9 +1,9 @@
 #ifdef __amd64__
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_x86-64_ops.c

@@ -1,9 +1,9 @@
 #ifdef __amd64__
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_x86-64_ops_sse.c

@@ -1,9 +1,9 @@
 #ifdef __amd64__
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_x86-64_uops.c

@@ -1,9 +1,9 @@
 #ifdef __amd64__
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x87.h"

src/cpu_new/codegen_backend_x86.c

@@ -3,9 +3,9 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_x86_ops.c

@@ -1,9 +1,9 @@
 #if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_x86_ops_fpu.c

@@ -1,9 +1,9 @@
 #if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_x86_ops_sse.c

@@ -1,9 +1,9 @@
 #if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_backend_x86_uops.c

@@ -1,9 +1,9 @@
 #if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_ops.h"

src/cpu_new/codegen_block.c

@@ -1,9 +1,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ir.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_allocator.h"

src/cpu_new/codegen_ops.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_ir.h"

src/cpu_new/codegen_ops_3dnow.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_arith.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_branch.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "386_common.h"

src/cpu_new/codegen_ops_fpu_arith.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_fpu_constant.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_fpu_loadstore.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_fpu_misc.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_helpers.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "386_common.h"

src/cpu_new/codegen_ops_jump.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "386_common.h"

src/cpu_new/codegen_ops_logic.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_misc.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_mmx_arith.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_mmx_cmp.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_mmx_loadstore.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_mmx_logic.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_mmx_pack.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_mmx_shift.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_mov.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "386_common.h"

src/cpu_new/codegen_ops_shift.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_ops_stack.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_flags.h"

src/cpu_new/codegen_reg.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_backend.h"

src/cpu_new/codegen_timing_486.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_ops.h"

src/cpu_new/codegen_timing_686.c

@@ -10,9 +10,9 @@
 */
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_ops.h"

src/cpu_new/codegen_timing_common.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen_timing_common.h"
 

src/cpu_new/codegen_timing_k6.c

@@ -1,10 +1,10 @@
 /*Most of the vector instructions here are a total guess.
   Some of the timings are based on http://users.atw.hu/instlatx64/AuthenticAMD0000562_K6_InstLatX86.txt*/
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
-#include "machine.h"
+#include <86box/mem.h>
+#include <86box/machine.h>
 
 #include "x86.h"
 #include "x86_ops.h"

src/cpu_new/codegen_timing_pentium.c

@@ -11,12 +11,12 @@
 */
 
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_ops.h"

src/cpu_new/codegen_timing_winchip.c

@@ -1,10 +1,10 @@
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
 #include "x86.h"
 #include "x86_ops.h"
 #include "x87.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "codegen.h"
 #include "codegen_ops.h"

src/cpu_new/codegen_timing_winchip2.c

@@ -8,9 +8,9 @@
   - Instructions with prefixes can pair if both instructions are fully decoded
     when the first instruction starts execution.*/
 #include <stdint.h>
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "mem.h"
+#include <86box/mem.h>
 
 #include "x86.h"
 #include "x86_ops.h"

src/cpu_new/x86seg.c

@@ -24,13 +24,13 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
+#include <86box/86box.h>
 #include "cpu.h"
-#include "device.h"
-#include "timer.h"
-#include "machine.h"
-#include "mem.h"
-#include "nvr.h"
+#include <86box/device.h>
+#include <86box/timer.h>
+#include <86box/machine.h>
+#include <86box/mem.h>
+#include <86box/nvr.h>
 #include "x86.h"
 #include "x86_flags.h"
 #include "386_common.h"

src/device.c

@@ -44,11 +44,11 @@
 #include <string.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "config.h"
-#include "device.h"
-#include "machine.h"
-#include "sound.h"
+#include <86box/86box.h>
+#include <86box/config.h>
+#include <86box/device.h>
+#include <86box/machine.h>
+#include <86box/sound.h>
 
 
 #define DEVICE_MAX	256			/* max # of devices */

src/disk/hdc.c

@@ -22,12 +22,12 @@
 #include <string.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "machine.h"
-#include "device.h"
-#include "hdc.h"
-#include "hdc_ide.h"
-#include "hdd.h"
+#include <86box/86box.h>
+#include <86box/machine.h>
+#include <86box/device.h>
+#include <86box/hdc.h>
+#include <86box/hdc_ide.h>
+#include <86box/hdd.h>
 
 
 int	hdc_current;

src/disk/hdc_esdi_at.c

@@ -28,19 +28,19 @@
 #include <stdlib.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "device.h"
-#include "86box_io.h"
-#include "mem.h"
-#include "pic.h"
-#include "rom.h"
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/io.h>
+#include <86box/mem.h>
+#include <86box/pic.h>
+#include <86box/rom.h>
 #include "cpu.h"
-#include "machine.h"
-#include "timer.h"
-#include "plat.h"
-#include "ui.h"
-#include "hdc.h"
-#include "hdd.h"
+#include <86box/machine.h>
+#include <86box/timer.h>
+#include <86box/plat.h>
+#include <86box/ui.h>
+#include <86box/hdc.h>
+#include <86box/hdd.h>
 
 
 #define HDC_TIME		(TIMER_USEC*10LL)