From ba392e475fb0fe79b43a39abd4908b06a2e29cdc Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Mon, 10 Oct 2011 16:34:58 +0300
Subject: [PATCH] headers: biTStream headers should not include mpeg/psi.h

---
 dvb/ci.h         | 3 ++-
 dvb/si.h         | 3 ++-
 mpeg/psi_print.h | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dvb/ci.h b/dvb/ci.h
index f9b496f..3c5c771 100644
--- a/dvb/ci.h
+++ b/dvb/ci.h
@@ -34,7 +34,8 @@
 #ifndef __BITSTREAM_DVB_CI_H__
 #define __BITSTREAM_DVB_CI_H__
 
-#include <bitstream/mpeg/psi.h>
+#include <bitstream/mpeg/psi/psi.h>
+#include <bitstream/mpeg/psi/descriptors.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/dvb/si.h b/dvb/si.h
index 558f3e8..263e182 100644
--- a/dvb/si.h
+++ b/dvb/si.h
@@ -35,7 +35,8 @@
 #define __BITSTREAM_DVB_SI_H__
 
 #include <bitstream/common.h>
-#include <bitstream/mpeg/psi.h>
+#include <bitstream/mpeg/psi/psi.h>
+#include <bitstream/mpeg/psi/descriptors.h>
 #include <bitstream/dvb/si/numbers.h>
 #include <bitstream/dvb/si/datetime.h>
 #include <bitstream/dvb/si/strings.h>
diff --git a/mpeg/psi_print.h b/mpeg/psi_print.h
index e03e9bf..f6381e6 100644
--- a/mpeg/psi_print.h
+++ b/mpeg/psi_print.h
@@ -28,8 +28,6 @@
 #ifndef __BITSTREAM_MPEG_PSI_PRINT_H__
 #define __BITSTREAM_MPEG_PSI_PRINT_H__
 
-#include <bitstream/common.h>
-#include <bitstream/mpeg/psi.h>
 #include <bitstream/mpeg/psi/pat_print.h>
 #include <bitstream/mpeg/psi/cat_print.h>
 #include <bitstream/mpeg/psi/tsdt_print.h>