diff --git a/src/lib_ccx/ccx_decoders_608.h b/src/lib_ccx/ccx_decoders_608.h
index 1736a673..c1254654 100644
--- a/src/lib_ccx/ccx_decoders_608.h
+++ b/src/lib_ccx/ccx_decoders_608.h
@@ -141,9 +141,5 @@ void handle_end_of_data(ccx_decoder_608_context *context, struct cc_subtitle *su
 int write_cc_buffer(ccx_decoder_608_context *context, struct cc_subtitle *sub);
 unsigned char *debug_608toASC(unsigned char *ccdata, int channel);
 
-//void delete_all_lines_but_current(ccx_decoder_608_context *context, struct eia608_screen *data, int row);
-
-LLONG get_visible_end(void);
-
 #define __608_H__
 #endif
diff --git a/src/lib_ccx/ccx_encoders_helpers.c b/src/lib_ccx/ccx_encoders_helpers.c
index 785c97fc..1291c639 100644
--- a/src/lib_ccx/ccx_encoders_helpers.c
+++ b/src/lib_ccx/ccx_encoders_helpers.c
@@ -334,7 +334,7 @@ int add_word(const char *word)
 }
 
 
-int add_built_in_words()
+int add_built_in_words(void)
 {
 	if (!spell_builtin_added)
 	{
@@ -378,7 +378,8 @@ void shell_sort(void *base, int nb, size_t size, int(*compar)(const void*p1, con
 	free(tmp);
 }
 
-void ccx_encoders_helpers_perform_shellsort_words(){
+void ccx_encoders_helpers_perform_shellsort_words(void)
+{
 	shell_sort(spell_lower, spell_words, sizeof(*spell_lower), string_cmp2, NULL);
 	shell_sort(spell_correct, spell_words, sizeof(*spell_correct), string_cmp2, NULL);
 }
diff --git a/src/lib_ccx/ccx_encoders_helpers.h b/src/lib_ccx/ccx_encoders_helpers.h
index 93cb6b36..14bb11e4 100644
--- a/src/lib_ccx/ccx_encoders_helpers.h
+++ b/src/lib_ccx/ccx_encoders_helpers.h
@@ -28,11 +28,11 @@ unsigned get_decoder_line_encoded(unsigned char *buffer, int line_num, struct ei
 
 int string_cmp(const void *p1, const void *p2);
 int string_cmp2(const void *p1, const void *p2, void *arg);
-int add_built_in_words();
+int add_built_in_words(void);
 int add_word(const char *word);
 
 void shell_sort(void *base, int nb, size_t size, int(*compar)(const void*p1, const void *p2, void*arg), void *arg);
 
-void ccx_encoders_helpers_perform_shellsort_words();
+void ccx_encoders_helpers_perform_shellsort_words(void);
 void ccx_encoders_helpers_setup(enum ccx_encoding_type encoding, int no_font_color, int no_type_setting, int trim_subs);
-#endif
\ No newline at end of file
+#endif
diff --git a/src/lib_ccx/file_functions.c b/src/lib_ccx/file_functions.c
index 1ad272d5..19808ca9 100644
--- a/src/lib_ccx/file_functions.c
+++ b/src/lib_ccx/file_functions.c
@@ -202,7 +202,7 @@ int switch_to_next_file (struct lib_ccx_ctx *ctx, LLONG bytesinbuffer)
     return 0;
 }
 
-void position_sanity_check ()
+void position_sanity_check (void)
 {
 #ifdef SANITY_CHECK
     if (in!=-1)
diff --git a/src/lib_ccx/general_loop.c b/src/lib_ccx/general_loop.c
index 14e9330a..0ee863b1 100644
--- a/src/lib_ccx/general_loop.c
+++ b/src/lib_ccx/general_loop.c
@@ -767,7 +767,7 @@ void rcwt_loop(struct lib_ccx_ctx *ctx, void *enc_ctx)
 
     if (parsebuf[6] == 0 && parsebuf[7] == 2)
     {
-        tlt_read_rcwt();
+        tlt_read_rcwt(ctx);
         return;
     }
 
diff --git a/src/lib_ccx/lib_ccx.h b/src/lib_ccx/lib_ccx.h
index 78d4c06f..1b9dcb64 100644
--- a/src/lib_ccx/lib_ccx.h
+++ b/src/lib_ccx/lib_ccx.h
@@ -219,7 +219,7 @@ int atoi_hex (char *s);
 int stringztoms (const char *s, struct ccx_boundary_time *bt);
 
 // general_loop.c
-void position_sanity_check ();
+void position_sanity_check (void);
 int init_file_buffer( void );
 LLONG ps_getmoredata(struct lib_ccx_ctx *ctx);
 LLONG general_getmoredata(struct lib_ccx_ctx *ctx);
@@ -341,16 +341,11 @@ extern void build_parity_table(void);
 void tlt_process_pes_packet(struct lib_ccx_ctx *ctx, uint8_t *buffer, uint16_t size);
 void telxcc_init(struct lib_ccx_ctx *ctx);
 void telxcc_close(struct lib_ccx_ctx *ctx);
-void tlt_read_rcwt();
-void mstotime(LLONG milli, unsigned *hours, unsigned *minutes,
-	unsigned *seconds, unsigned *ms);
+void tlt_read_rcwt(struct lib_ccx_ctx *ctx);
 
 extern unsigned rollover_bits;
 extern int global_timestamp_inited;
 
-extern LLONG result; // Number of bytes read/skipped in last read operation
-
-
 extern int strangeheader;
 
 extern unsigned char *filebuffer;
@@ -362,7 +357,6 @@ extern const char *desc[256];
 
 
 extern long FILEBUFFERSIZE; // Uppercase because it used to be a define
-extern struct ccx_s_options ccx_options;
 extern unsigned long net_activity_gui;
 
 /* General (ES stream) video information */
@@ -371,12 +365,8 @@ extern unsigned current_vert_size;
 extern unsigned current_aspect_ratio;
 extern unsigned current_frame_rate;
 
-extern int end_of_file;
-extern LLONG inbuf;
 extern enum ccx_bufferdata_type bufferdatatype; // Can be CCX_BUFFERDATA_TYPE_RAW or CCX_BUFFERDATA_TYPE_PES
 
-extern unsigned top_field_first;
-
 extern int firstcall;
 
 #define MAXBFRAMES 50