diff --git a/core/cd_hw/libchdr/src/bitstream.c b/core/cd_hw/libchdr/src/bitstream.c
index c82a67ddc..d42741d7e 100644
--- a/core/cd_hw/libchdr/src/bitstream.c
+++ b/core/cd_hw/libchdr/src/bitstream.c
@@ -9,7 +9,7 @@
 ***************************************************************************/
 
 #include <stdlib.h>
-#include <libchdr/bitstream.h>
+#include "bitstream.h"
 
 /***************************************************************************
  *  INLINE FUNCTIONS
diff --git a/core/cd_hw/libchdr/src/cdrom.c b/core/cd_hw/libchdr/src/cdrom.c
index 44fa66466..43adec13d 100644
--- a/core/cd_hw/libchdr/src/cdrom.c
+++ b/core/cd_hw/libchdr/src/cdrom.c
@@ -18,7 +18,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <libchdr/cdrom.h>
+#include "cdrom.h"
 
 #ifdef WANT_RAW_DATA_SECTOR
 
diff --git a/core/cd_hw/libchdr/src/cdrom.h b/core/cd_hw/libchdr/src/cdrom.h
index 5bd4a2e02..a54996e2c 100644
--- a/core/cd_hw/libchdr/src/cdrom.h
+++ b/core/cd_hw/libchdr/src/cdrom.h
@@ -14,7 +14,6 @@
 #define __CDROM_H__
 
 #include <stdint.h>
-#include <libchdr/chdconfig.h>
 
 /***************************************************************************
     CONSTANTS
diff --git a/core/cd_hw/libchdr/src/chd.c b/core/cd_hw/libchdr/src/chd.c
index 632426ee7..01524e379 100644
--- a/core/cd_hw/libchdr/src/chd.c
+++ b/core/cd_hw/libchdr/src/chd.c
@@ -42,12 +42,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-
-#include <libchdr/chd.h>
-#include <libchdr/cdrom.h>
-#include <libchdr/flac.h>
-#include <libchdr/huffman.h>
-
+#include "types.h"
+#include "osd.h"
+#include "macros.h"
+#include "chd.h"
+#include "cdrom.h"
+#include "flac.h"
+#include "huffman.h"
 #include "zlib.h"
 #include "LzmaEnc.h"
 #include "LzmaDec.h"
diff --git a/core/cd_hw/libchdr/src/chd.h b/core/cd_hw/libchdr/src/chd.h
index 61b149dcf..af8d6b7aa 100644
--- a/core/cd_hw/libchdr/src/chd.h
+++ b/core/cd_hw/libchdr/src/chd.h
@@ -46,8 +46,7 @@
 extern "C" {
 #endif
 
-#include <libchdr/coretypes.h>
-#include <libchdr/chdconfig.h>
+#include "coretypes.h"
 
 /***************************************************************************
 
diff --git a/core/cd_hw/libchdr/src/flac.c b/core/cd_hw/libchdr/src/flac.c
index 4ded43ba4..7a8be98db 100644
--- a/core/cd_hw/libchdr/src/flac.c
+++ b/core/cd_hw/libchdr/src/flac.c
@@ -11,7 +11,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <libchdr/flac.h>
+#include "flac.h"
 #define DR_FLAC_IMPLEMENTATION
 #include <dr_libs/dr_flac.h>
 
diff --git a/core/cd_hw/libchdr/src/huffman.c b/core/cd_hw/libchdr/src/huffman.c
index 6a50f1344..3d3b6a675 100644
--- a/core/cd_hw/libchdr/src/huffman.c
+++ b/core/cd_hw/libchdr/src/huffman.c
@@ -101,7 +101,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <libchdr/huffman.h>
+#include "huffman.h"
 
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
diff --git a/core/cd_hw/libchdr/src/huffman.h b/core/cd_hw/libchdr/src/huffman.h
index 6c9f51136..183bd74fd 100644
--- a/core/cd_hw/libchdr/src/huffman.h
+++ b/core/cd_hw/libchdr/src/huffman.h
@@ -13,7 +13,7 @@
 #ifndef __HUFFMAN_H__
 #define __HUFFMAN_H__
 
-#include <libchdr/bitstream.h>
+#include "bitstream.h"
 
 
 /***************************************************************************