--- DjVu3.orig/src/libdjvu++/JPEGDecoder.h	Thu Jan  4 23:04:55 2001
+++ DjVu3/src/libdjvu++/JPEGDecoder.h	Mon Jul  9 01:25:02 2001
@@ -43,11 +43,12 @@
 
 #ifdef NEED_JPEG_DECODER
 
+#include <stdio.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <jinclude.h>
 #include <jpeglib.h>
 #include <jerror.h>
 
--- DjVu3.orig/src/libdjvu++/JPEGDecoder.cpp	Tue Mar  6 20:55:42 2001
+++ DjVu3/src/libdjvu++/JPEGDecoder.cpp	Mon Jul  9 01:36:09 2001
@@ -240,11 +240,11 @@
   { /* first time for this JPEG object? */
     cinfo->src = (struct jpeg_source_mgr *)      
       (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-          SIZEOF(byte_stream_src_mgr));
+          sizeof(byte_stream_src_mgr));
     src = (byte_stream_src_ptr) cinfo->src;
     src->buffer = (JOCTET *)
       (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-          INPUT_BUF_SIZE * SIZEOF(JOCTET));
+          INPUT_BUF_SIZE * sizeof(JOCTET));
   }
 
   src = (byte_stream_src_ptr) cinfo->src;