From 906b13504da4f1ff988494962226d86a2faba535 Mon Sep 17 00:00:00 2001
From: Stuart Caie <kyzer@cabextract.org.uk>
Date: Mon, 22 Oct 2018 13:55:38 +0100
Subject: [PATCH] Fix build when --with-external-libmspack is used

---
 cabextract/src/cabinfo.c | 4 ++--
 libmspack/mspack/cab.h   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/cabinfo.c b/src/cabinfo.c
index b4049b3..a4b14bf 100644
--- a/src/cabinfo.c
+++ b/src/cabinfo.c
@@ -34,9 +34,9 @@
 #endif
 
 /* include <system.h> from libmspack for LD and EndGetI?? macros */
-#include <system.h>
+#include <mspack/system.h>
 /* include <cab.h> from libmspack for cab structure offsets */
-#include <cab.h>
+#include <mspack/cab.h>
 
 #if HAVE_FSEEKO
 # define FSEEK fseeko
diff --git a/mspack/cab.h b/mspack/cab.h
index 5761d43..9bbf842 100644
--- a/mspack/cab.h
+++ b/mspack/cab.h
@@ -10,10 +10,6 @@
 #ifndef MSPACK_CAB_H
 #define MSPACK_CAB_H 1
 
-#include <mszip.h>
-#include <qtm.h>
-#include <lzx.h>
-
 /* generic CAB definitions */
 
 /* structure offsets */