diff --git a/libretro-common/include/streams/interface_stream.h b/libretro-common/include/streams/interface_stream.h
index 213493de0d..7eda0e7f8f 100644
--- a/libretro-common/include/streams/interface_stream.h
+++ b/libretro-common/include/streams/interface_stream.h
@@ -30,8 +30,6 @@
 #include <retro_common_api.h>
 #include <boolean.h>
 
-#include <libchdr/chd.h>
-
 RETRO_BEGIN_DECLS
 
 enum intfstream_type
@@ -56,7 +54,7 @@ typedef struct intfstream_info
    } memory;
    struct
    {
-      chd_file *handle;
+      void *handle;
       int32_t track;
    } chd;
    enum intfstream_type type;
diff --git a/libretro-common/streams/interface_stream.c b/libretro-common/streams/interface_stream.c
index b9cf8cde49..a2fe9ac8b3 100644
--- a/libretro-common/streams/interface_stream.c
+++ b/libretro-common/streams/interface_stream.c
@@ -25,7 +25,9 @@
 #include <streams/interface_stream.h>
 #include <streams/file_stream.h>
 #include <streams/memory_stream.h>
+#ifdef HAVE_CHD
 #include <streams/chd_stream.h>
+#endif
 
 struct intfstream_internal
 {
@@ -46,11 +48,13 @@ struct intfstream_internal
       memstream_t *fp;
       bool writable;
    } memory;
+#ifdef HAVE_CHD
    struct
    {
       int32_t track;
       chdstream_t *fp;
    } chd;
+#endif
 };
 
 bool intfstream_resize(intfstream_internal_t *intf, intfstream_info_t *info)