diff --git a/cdjpeg.h b/cdjpeg.h
index 35acc35..b3ea5d8 100644
--- a/cdjpeg.h
+++ b/cdjpeg.h
@@ -1,7 +1,7 @@
 /*
  * cdjpeg.h
  *
- * Copyright (C) 1994, Thomas G. Lane.
+ * Copyright (C) 1994-1995, Thomas G. Lane.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -102,7 +102,16 @@
 #define jinit_write_rle		jIWrRLE
 #define jinit_read_targa	jIRdTarga
 #define jinit_write_targa	jIWrTarga
+#define read_quant_tables	RdQTables
+#define read_scan_script	RdScnScript
+#define set_quant_slots		SetQSlots
+#define set_sample_factors	SetSFacts
 #define read_color_map		RdCMap
+#define enable_signal_catcher	EnSigCatcher
+#define start_progress_monitor	StProgMon
+#define end_progress_monitor	EnProgMon
+#define read_stdin		RdStdin
+#define write_stdout		WrStdout
 #endif /* NEED_SHORT_EXTERNAL_NAMES */
 
 /* Module selection routines for I/O modules. */
@@ -119,6 +128,52 @@
 EXTERN cjpeg_source_ptr jinit_read_targa JPP((j_compress_ptr cinfo));
 EXTERN djpeg_dest_ptr jinit_write_targa JPP((j_decompress_ptr cinfo));
 
-/* Other global routines */
+/* cjpeg support routines (in rdswitch.c) */
+
+EXTERN boolean read_quant_tables JPP((j_compress_ptr cinfo, char * filename,
+				   int scale_factor, boolean force_baseline));
+EXTERN boolean read_scan_script JPP((j_compress_ptr cinfo, char * filename));
+EXTERN boolean set_quant_slots JPP((j_compress_ptr cinfo, char *arg));
+EXTERN boolean set_sample_factors JPP((j_compress_ptr cinfo, char *arg));
+
+/* djpeg support routines (in rdcolmap.c) */
 
 EXTERN void read_color_map JPP((j_decompress_ptr cinfo, FILE * infile));
+
+/* common support routines (in cdjpeg.c) */
+
+EXTERN void enable_signal_catcher JPP((j_common_ptr cinfo));
+EXTERN void start_progress_monitor JPP((j_common_ptr cinfo,
+					cd_progress_ptr progress));
+EXTERN void end_progress_monitor JPP((j_common_ptr cinfo));
+EXTERN boolean keymatch JPP((char * arg, const char * keyword, int minchars));
+EXTERN FILE * read_stdin JPP((void));
+EXTERN FILE * write_stdout JPP((void));
+
+/* miscellaneous useful macros */
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#define WRITE_BINARY	"w"
+#else
+#define READ_BINARY	"rb"
+#define WRITE_BINARY	"wb"
+#endif
+
+#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
+#define EXIT_FAILURE  1
+#endif
+#ifndef EXIT_SUCCESS
+#ifdef VMS
+#define EXIT_SUCCESS  1		/* VMS is very nonstandard */
+#else
+#define EXIT_SUCCESS  0
+#endif
+#endif
+#ifndef EXIT_WARNING
+#ifdef VMS
+#define EXIT_WARNING  1		/* VMS is very nonstandard */
+#else
+#define EXIT_WARNING  2
+#endif
+#endif