diff --git a/src/ccx_common_constants.h b/src/ccx_common_constants.h
index aa18f239..07a9f6af 100644
--- a/src/ccx_common_constants.h
+++ b/src/ccx_common_constants.h
@@ -1,6 +1,8 @@
 #ifndef CCX_CONSTANTS_H
 #define CCX_CONSTANTS_H
 
+#include "stdio.h"
+
 #ifndef __cplusplus
 #define false 0
 #define true 1
diff --git a/src/ccx_decoders_structs.h b/src/ccx_decoders_structs.h
index a41a7ace..51ecba70 100644
--- a/src/ccx_decoders_structs.h
+++ b/src/ccx_decoders_structs.h
@@ -2,6 +2,19 @@
 
 #include "ccx_common_platform.h"
 
+/* flag raised when end of display marker arrives in Dvb Subtitle */
+#define SUB_EOD_MARKER (1 << 0 )
+struct cc_bitmap
+{
+	int x;
+	int y;
+	int w;
+	int h;
+	int nb_colors;
+	unsigned char *data[2];
+	int linesize[2];
+};
+
 /**
 * Raw Subtitle struct used as output of decoder (cc608)
 * and input for encoder (sami, srt, transcript or smptett etc)
@@ -16,6 +29,15 @@ struct cc_subtitle
 	void *data;
 	/** number of data */
 	unsigned int nb_data;
+	/**  type of subtitle */
+	enum subtype type;
+	/* set only when all the data is to be displayed at same time */
+	LLONG start_time;
+	LLONG end_time;
+	/* flags */
+	int flags;
+	/* index of language table */
+	int lang_index;
 	/** flag to tell that decoder has given output */
 	int got_output;
 };
diff --git a/src/dvb_subtitle_decoder.c b/src/dvb_subtitle_decoder.c
index 76af7931..d480c2be 100644
--- a/src/dvb_subtitle_decoder.c
+++ b/src/dvb_subtitle_decoder.c
@@ -24,7 +24,7 @@
 
 #include "dvb_subtitle_decoder.h"
 #include "utility.h"
-#include "cc_decoders_common.h"
+#include "ccx_decoders_common.h"
 
 #define DVBSUB_PAGE_SEGMENT     0x10
 #define DVBSUB_REGION_SEGMENT   0x11
diff --git a/src/spupng_encoder.c b/src/spupng_encoder.c
index 8addc615..9e829ec8 100644
--- a/src/spupng_encoder.c
+++ b/src/spupng_encoder.c
@@ -2,7 +2,7 @@
 #include "ccx_common_platform.h"
 #include "spupng_encoder.h"
 #include <assert.h>
-#include "cc_encoders_common.h"
+#include "ccx_encoders_common.h"
 #include "utility.h"
 #ifdef ENABLE_OCR
 #include "ocr.h"