diff --git a/src/include/86box/nv/classes/vid_nv3_classes.h b/src/include/86box/nv/classes/vid_nv3_classes.h
index 0e638f17e..aa23d29dc 100644
--- a/src/include/86box/nv/classes/vid_nv3_classes.h
+++ b/src/include/86box/nv/classes/vid_nv3_classes.h
@@ -11,8 +11,7 @@
  *          Note: These uint32_ts are basically object methods that are being submitted
  *          They have different names so the user can use them more easily but different versions of the same class can be distinguished
  *          ALL of these structures HAVE(?) to be a size of exactly 0x2000 bytes because that's what the hashtable expects and they need to actually map into the vram address space
- *          (they are converted to pointers).
- *          directly to the PHYSICAL PGRAPH REGISTERS while sitting in RAMHT!!!!.
+ *          (they are converted to pointers). In the case of NV3, these map directly to the PHYSICAL PGRAPH REGISTERS while sitting in RAMHT!!!!.
  *
  *          Also, these class IDs don't relate to the internal architecture of the GPU.
  *          Effectively, the NVIDIA drivers are faking shit. There are only 16 classes but the drivers recognise many more. See nv3_object_classes_driver.txt for the list of  
@@ -1065,8 +1064,7 @@ typedef enum nv3_object_class_01C_pixel_format_e
     // 16-bits (Y16) - Planar YUV 16 bits (Y value only), 2 bits of indexed colour too?
     nv3_m2mt_pixel_format_le_y16_p2 = 0x1010101,
 
-    /* 1 unused bit, 555 15-bit format, p2(?)
-    */
+    /* 1 unused bit, 555 15-bit format, p2(?) */
     nv3_m2mt_pixel_format_x1r5g5b5_p2 = 0x1000000,
 
     // X8G8B8R8, 24-bit colour (or 24-bit colour with alpha)
diff --git a/src/include/86box/nv/vid_nv3.h b/src/include/86box/nv/vid_nv3.h
index aeff3a8ce..72d6d5a3d 100644
--- a/src/include/86box/nv/vid_nv3.h
+++ b/src/include/86box/nv/vid_nv3.h
@@ -22,7 +22,7 @@
  */
 
 #pragma once
-#include <86Box/nv/classes/vid_nv3_classes.h>
+#include <86box/nv/classes/vid_nv3_classes.h>
 
 // The GPU base structure
 extern const device_config_t nv3_config[];
diff --git a/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c b/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c
index b6b97ee3a..7a700bf6e 100644
--- a/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c
+++ b/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_001 beta_factor;
diff --git a/src/video/nv/nv3/classes/nv3_class_002_rop.c b/src/video/nv/nv3/classes/nv3_class_002_rop.c
index 747d4b017..ac06ef010 100644
--- a/src/video/nv/nv3/classes/nv3_class_002_rop.c
+++ b/src/video/nv/nv3/classes/nv3_class_002_rop.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_002 nv3_rop;
diff --git a/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c b/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c
index 08f854529..887e2a8bd 100644
--- a/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c
+++ b/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_003 nv3_chroma_key; 
diff --git a/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c b/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c
index 0388bc35a..95e5e70c4 100644
--- a/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c
+++ b/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_004 nv3_plane_mask; 
diff --git a/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c b/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c
index 01f395040..76ab1cfec 100644
--- a/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c
+++ b/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c
@@ -18,14 +18,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_005 nv3_clipping_rectangle; 
diff --git a/src/video/nv/nv3/classes/nv3_class_006_pattern.c b/src/video/nv/nv3/classes/nv3_class_006_pattern.c
index 282557b95..32561e977 100644
--- a/src/video/nv/nv3/classes/nv3_class_006_pattern.c
+++ b/src/video/nv/nv3/classes/nv3_class_006_pattern.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_006 nv3_pattern; 
diff --git a/src/video/nv/nv3/classes/nv3_class_007_rectangle.c b/src/video/nv/nv3/classes/nv3_class_007_rectangle.c
index 3d378df91..2b194960b 100644
--- a/src/video/nv/nv3/classes/nv3_class_007_rectangle.c
+++ b/src/video/nv/nv3/classes/nv3_class_007_rectangle.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_007 nv3_rectangle; 
diff --git a/src/video/nv/nv3/classes/nv3_class_008_point.c b/src/video/nv/nv3/classes/nv3_class_008_point.c
index 55fae702c..eaa12f5c4 100644
--- a/src/video/nv/nv3/classes/nv3_class_008_point.c
+++ b/src/video/nv/nv3/classes/nv3_class_008_point.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_008 nv3_point; 
diff --git a/src/video/nv/nv3/classes/nv3_class_009_line.c b/src/video/nv/nv3/classes/nv3_class_009_line.c
index cd0a8b768..a17cf0f90 100644
--- a/src/video/nv/nv3/classes/nv3_class_009_line.c
+++ b/src/video/nv/nv3/classes/nv3_class_009_line.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_009 nv3_line; 
diff --git a/src/video/nv/nv3/classes/nv3_class_00a_lin.c b/src/video/nv/nv3/classes/nv3_class_00a_lin.c
index f9c23dc21..66d3d949b 100644
--- a/src/video/nv/nv3/classes/nv3_class_00a_lin.c
+++ b/src/video/nv/nv3/classes/nv3_class_00a_lin.c
@@ -20,14 +20,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_00A nv3_lin; 
diff --git a/src/video/nv/nv3/classes/nv3_class_00b_triangle.c b/src/video/nv/nv3/classes/nv3_class_00b_triangle.c
index a65b3d600..f1d41a816 100644
--- a/src/video/nv/nv3/classes/nv3_class_00b_triangle.c
+++ b/src/video/nv/nv3/classes/nv3_class_00b_triangle.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_00B nv3_triangle; 
diff --git a/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c b/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c
index 54c013783..d8dbc4513 100644
--- a/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c
+++ b/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_00C nv3_win95_gdi_text;
diff --git a/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c b/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c
index 10ccb9bc3..4f51f187a 100644
--- a/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c
+++ b/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_00D nv3_m2mf;
diff --git a/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c b/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c
index 9a4e86dca..165c1e9d3 100644
--- a/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c
+++ b/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_00E nv3_scaled_image_from_mem;
diff --git a/src/video/nv/nv3/classes/nv3_class_010_blit.c b/src/video/nv/nv3/classes/nv3_class_010_blit.c
index 2bcdc2234..f32309343 100644
--- a/src/video/nv/nv3/classes/nv3_class_010_blit.c
+++ b/src/video/nv/nv3/classes/nv3_class_010_blit.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_010 nv3_blit;
diff --git a/src/video/nv/nv3/classes/nv3_class_011_image.c b/src/video/nv/nv3/classes/nv3_class_011_image.c
index 9a2f73486..e42ea8071 100644
--- a/src/video/nv/nv3/classes/nv3_class_011_image.c
+++ b/src/video/nv/nv3/classes/nv3_class_011_image.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_011 nv3_image; 
diff --git a/src/video/nv/nv3/classes/nv3_class_012_bitmap.c b/src/video/nv/nv3/classes/nv3_class_012_bitmap.c
index f2d49f6b0..a0ff8d537 100644
--- a/src/video/nv/nv3/classes/nv3_class_012_bitmap.c
+++ b/src/video/nv/nv3/classes/nv3_class_012_bitmap.c
@@ -20,14 +20,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_012 nv3_bitmap; 
diff --git a/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c b/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c
index ada899cf6..bc4e3f879 100644
--- a/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c
+++ b/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c
@@ -20,14 +20,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_014 nv3_transfer2memory; 
diff --git a/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c b/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c
index 24480624d..1954724d1 100644
--- a/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c
+++ b/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_015 nv3_stretched_image_from_cpu; 
diff --git a/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c b/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c
index b45ef8968..7c669a1e5 100644
--- a/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c
+++ b/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_017 nv3_d3d5_tri;
diff --git a/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c b/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c
index 23e09904f..bbf29694f 100644
--- a/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c
+++ b/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_018 nv3_d3d5_point_zeta_buffer;
diff --git a/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c b/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c
index e6533627d..f40924deb 100644
--- a/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c
+++ b/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 struct nv3_object_class_01C nv3_image_in_memory;
diff --git a/src/video/nv/nv3/classes/nv3_class_names.c b/src/video/nv/nv3/classes/nv3_class_names.c
index e05ddc1eb..ded63ece2 100644
--- a/src/video/nv/nv3/classes/nv3_class_names.c
+++ b/src/video/nv/nv3/classes/nv3_class_names.c
@@ -16,14 +16,14 @@
  */
 #include <stdio.h>
 #include <stdint.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
 #include <86box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/nv/vid_nv3.h>
 
 /* These are the object classes AS RECOGNISED BY THE GRAPHICS HARDWARE. */
 /* The drivers implement a COMPLETELY DIFFERENT SET OF CLASSES. */
diff --git a/src/video/nv/nv3/classes/nv3_class_shared_methods.c b/src/video/nv/nv3/classes/nv3_class_shared_methods.c
index e336168c6..dd6c49fed 100644
--- a/src/video/nv/nv3/classes/nv3_class_shared_methods.c
+++ b/src/video/nv/nv3/classes/nv3_class_shared_methods.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h>
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h>
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 void nv3_generic_method(uint32_t method_id, nv3_grobj_t grobj)
diff --git a/src/video/nv/nv3/nv3_core.c b/src/video/nv/nv3/nv3_core.c
index d190c838e..949ce53be 100644
--- a/src/video/nv/nv3/nv3_core.c
+++ b/src/video/nv/nv3/nv3_core.c
@@ -17,15 +17,15 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
-#include <86Box/io.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/io.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 nv3_t* nv3;
 
diff --git a/src/video/nv/nv3/nv3_core_arbiter.c b/src/video/nv/nv3/nv3_core_arbiter.c
index de3bc2eec..6e8e2b9a5 100644
--- a/src/video/nv/nv3/nv3_core_arbiter.c
+++ b/src/video/nv/nv3/nv3_core_arbiter.c
@@ -24,14 +24,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 // Gets a register...
 // move this somewhere else when we have more models
diff --git a/src/video/nv/nv3/nv3_core_config.c b/src/video/nv/nv3/nv3_core_config.c
index d32a7dfd7..e8beb6df7 100644
--- a/src/video/nv/nv3/nv3_core_config.c
+++ b/src/video/nv/nv3/nv3_core_config.c
@@ -17,15 +17,15 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/io.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 const device_config_t nv3_config[] =
 {
diff --git a/src/video/nv/nv3/subsystems/nv3_pbus.c b/src/video/nv/nv3/subsystems/nv3_pbus.c
index e9d8723ad..c9fd0f3aa 100644
--- a/src/video/nv/nv3/subsystems/nv3_pbus.c
+++ b/src/video/nv/nv3/subsystems/nv3_pbus.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 // NV3 PBUS RMA - Real Mode Access for VBIOS
 // This basically works like a shifter, you write one byte at a time from [0x3d0...0x3d3] and it shifts it in to build a 32-bit MMIO address...
diff --git a/src/video/nv/nv3/subsystems/nv3_pbus_dma.c b/src/video/nv/nv3/subsystems/nv3_pbus_dma.c
index 3aa1d497b..d5d17fe2d 100644
--- a/src/video/nv/nv3/subsystems/nv3_pbus_dma.c
+++ b/src/video/nv/nv3/subsystems/nv3_pbus_dma.c
@@ -19,13 +19,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 /* Nvidia DMA Engine */
\ No newline at end of file
diff --git a/src/video/nv/nv3/subsystems/nv3_pextdev.c b/src/video/nv/nv3/subsystems/nv3_pextdev.c
index c62911fb2..6d8cadbf0 100644
--- a/src/video/nv/nv3/subsystems/nv3_pextdev.c
+++ b/src/video/nv/nv3/subsystems/nv3_pextdev.c
@@ -20,14 +20,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 void nv3_pextdev_init()
 {
diff --git a/src/video/nv/nv3/subsystems/nv3_pfb.c b/src/video/nv/nv3/subsystems/nv3_pfb.c
index b2eae7c55..435225bc2 100644
--- a/src/video/nv/nv3/subsystems/nv3_pfb.c
+++ b/src/video/nv/nv3/subsystems/nv3_pfb.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 // Functions only used in this translation unit
 uint32_t nv3_pfb_config0_read();
diff --git a/src/video/nv/nv3/subsystems/nv3_pfifo.c b/src/video/nv/nv3/subsystems/nv3_pfifo.c
index ad4d4469f..4a62c8cf5 100644
--- a/src/video/nv/nv3/subsystems/nv3_pfifo.c
+++ b/src/video/nv/nv3/subsystems/nv3_pfifo.c
@@ -6,9 +6,9 @@
  *
  *          This file is part of the 86Box distribution.
  *
- *          NV3 pfifo (FIFO for graphics object submission)
- *
- *
+ *          NV3 PFIFO (FIFO for graphics object submission)
+ *          PIO object submission
+ *          Gray code conversion routines
  *
  * Authors: Connor Hyde, <mario64crashed@gmail.com> I need a better email address ;^)
  *
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 //
 // ****** PFIFO register list START ******
diff --git a/src/video/nv/nv3/subsystems/nv3_pgraph.c b/src/video/nv/nv3/subsystems/nv3_pgraph.c
index b1743c04d..85ad21cff 100644
--- a/src/video/nv/nv3/subsystems/nv3_pgraph.c
+++ b/src/video/nv/nv3/subsystems/nv3_pgraph.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 
 // Initialise the PGRAPH subsystem.
diff --git a/src/video/nv/nv3/subsystems/nv3_pmc.c b/src/video/nv/nv3/subsystems/nv3_pmc.c
index f7f91e87d..f67eb707b 100644
--- a/src/video/nv/nv3/subsystems/nv3_pmc.c
+++ b/src/video/nv/nv3/subsystems/nv3_pmc.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 
 
diff --git a/src/video/nv/nv3/subsystems/nv3_pme.c b/src/video/nv/nv3/subsystems/nv3_pme.c
index 392bcfd63..e555c9752 100644
--- a/src/video/nv/nv3/subsystems/nv3_pme.c
+++ b/src/video/nv/nv3/subsystems/nv3_pme.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 nv_register_t pme_registers[] = {
     { NV3_PME_INTR, "PME - Interrupt Status", NULL, NULL},
diff --git a/src/video/nv/nv3/subsystems/nv3_pramdac.c b/src/video/nv/nv3/subsystems/nv3_pramdac.c
index 95cc2afe2..6ff090716 100644
--- a/src/video/nv/nv3/subsystems/nv3_pramdac.c
+++ b/src/video/nv/nv3/subsystems/nv3_pramdac.c
@@ -22,14 +22,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 void nv3_pramdac_init()
 {
diff --git a/src/video/nv/nv3/subsystems/nv3_pramin.c b/src/video/nv/nv3/subsystems/nv3_pramin.c
index 16655779b..8dcba1b54 100644
--- a/src/video/nv/nv3/subsystems/nv3_pramin.c
+++ b/src/video/nv/nv3/subsystems/nv3_pramin.c
@@ -20,14 +20,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
-#include <86Box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/pci.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 #include <86box/nv/classes/vid_nv3_classes.h>
 
 // Functions only used in this translation unit
diff --git a/src/video/nv/nv3/subsystems/nv3_pramin_ramfc.c b/src/video/nv/nv3/subsystems/nv3_pramin_ramfc.c
index 47db7b3b5..9a21c2e4f 100644
--- a/src/video/nv/nv3/subsystems/nv3_pramin_ramfc.c
+++ b/src/video/nv/nv3/subsystems/nv3_pramin_ramfc.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 uint32_t nv3_ramfc_read(uint32_t address)
 {
diff --git a/src/video/nv/nv3/subsystems/nv3_pramin_ramht.c b/src/video/nv/nv3/subsystems/nv3_pramin_ramht.c
index b471f3a87..e56dd5c3a 100644
--- a/src/video/nv/nv3/subsystems/nv3_pramin_ramht.c
+++ b/src/video/nv/nv3/subsystems/nv3_pramin_ramht.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
-#include <86Box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
+#include <86box/pci.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 /* This implements the hash that all the objects are stored within.
 It is used to get the offset within RAMHT of a graphics object.
diff --git a/src/video/nv/nv3/subsystems/nv3_pramin_ramro.c b/src/video/nv/nv3/subsystems/nv3_pramin_ramro.c
index 3ba6b9d7a..2104868c6 100644
--- a/src/video/nv/nv3/subsystems/nv3_pramin_ramro.c
+++ b/src/video/nv/nv3/subsystems/nv3_pramin_ramro.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 uint32_t nv3_ramro_read(uint32_t address)
 {
diff --git a/src/video/nv/nv3/subsystems/nv3_ptimer.c b/src/video/nv/nv3/subsystems/nv3_ptimer.c
index 366f2510f..aa5942ad8 100644
--- a/src/video/nv/nv3/subsystems/nv3_ptimer.c
+++ b/src/video/nv/nv3/subsystems/nv3_ptimer.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 
 nv_register_t ptimer_registers[] = {
diff --git a/src/video/nv/nv3/subsystems/nv3_pvideo.c b/src/video/nv/nv3/subsystems/nv3_pvideo.c
index 6709c92a2..db6e78a59 100644
--- a/src/video/nv/nv3/subsystems/nv3_pvideo.c
+++ b/src/video/nv/nv3/subsystems/nv3_pvideo.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 
 nv_register_t pvideo_registers[] = {
diff --git a/src/video/nv/nv3/subsystems/nv3_user.c b/src/video/nv/nv3/subsystems/nv3_user.c
index c26df9b40..5732ec144 100644
--- a/src/video/nv/nv3/subsystems/nv3_user.c
+++ b/src/video/nv/nv3/subsystems/nv3_user.c
@@ -19,14 +19,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <86Box/86box.h>
-#include <86Box/device.h>
-#include <86Box/mem.h>
+#include <86box/86box.h>
+#include <86box/device.h>
+#include <86box/mem.h>
 #include <86box/pci.h>
-#include <86Box/rom.h> // DEPENDENT!!!
-#include <86Box/video.h>
-#include <86Box/nv/vid_nv.h>
-#include <86Box/nv/vid_nv3.h>
+#include <86box/rom.h> // DEPENDENT!!!
+#include <86box/video.h>
+#include <86box/nv/vid_nv.h>
+#include <86box/nv/vid_nv3.h>
 
 
 // PIO Method Submission
diff --git a/src/video/nv/nv_base.c b/src/video/nv/nv_base.c
index af17bd3a7..420d209b4 100644
--- a/src/video/nv/nv_base.c
+++ b/src/video/nv/nv_base.c
@@ -21,11 +21,11 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
-#include <86Box/86box.h>
+#include <86box/86box.h>
 #ifndef RELEASE_BUILD
-#include <86Box/device.h>
+#include <86box/device.h>
 #endif
-#include <86Box/log.h>
+#include <86box/log.h>
 
 
 // Common logging