diff -ur mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh mjpegtools-1.8.0/y4mdenoise/Region2D.hh
--- mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh	2005-12-19 12:36:54.000000000 +0300
+++ mjpegtools-1.8.0/y4mdenoise/Region2D.hh	2005-12-19 12:44:36.000000000 +0300
@@ -16,7 +16,7 @@
 
 #include "Status_t.h"
 #include <iostream>
-
+#include <cassert>
 
 
 // The 2-dimensional region class.  Parameterized by the numeric type


diff -ur mjpegtools-1.8.0.old/mpeg2enc/encodertypes.h mjpegtools-1.8.0/mpeg2enc/encodertypes.h
--- mjpegtools-1.8.0.old/mpeg2enc/encodertypes.h	2008-10-28 13:17:34.000000000 -0500
+++ mjpegtools-1.8.0/mpeg2enc/encodertypes.h	2008-10-28 13:34:41.000000000 -0500
@@ -23,7 +23,9 @@
  * 02111-1307, USA.
  *
  */
-
+
+#include <cstdlib>
+
 #include "config.h"


diff -ur mjpegtools-1.8.0.old/mpeg2enc/macroblock.cc mjpegtools-1.8.0/mpeg2enc/macroblock.cc
--- mjpegtools-1.8.0.old/mpeg2enc/macroblock.cc	2008-10-28 13:17:34.000000000 -0500
+++ mjpegtools-1.8.0/mpeg2enc/macroblock.cc	2008-10-28 13:32:54.000000000 -0500
@@ -19,6 +19,9 @@
  *
  */
 
+
+#include <limits>
+
 #include <stdio.h>
 
 #include "macroblock.hh"
@@ -49,7 +52,7 @@
 {
     vector<MotionEst>::iterator i;
     vector<MotionEst>::iterator min_me;
-    int best_score = INT_MAX;
+    int best_score = std::numeric_limits<int>::max();
     int cur_score;
 
     //

diff -ur mjpegtools-1.8.0.old/mpeg2enc/picturereader.cc mjpegtools-1.8.0/mpeg2enc/picturereader.cc
--- mjpegtools-1.8.0.old/mpeg2enc/picturereader.cc	2008-10-28 13:17:34.000000000 -0500
+++ mjpegtools-1.8.0/mpeg2enc/picturereader.cc	2008-10-28 13:36:50.000000000 -0500
@@ -20,6 +20,8 @@
  */
 
 
+#include <limits>
+
 #include "picturereader.hh"
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,7 +39,7 @@
 	frames_read = 0;
 	last_frame = -1;
     lum_mean = 0;
-    istrm_nframes = INT_MAX;
+    istrm_nframes = std::numeric_limits<int>::max();
 }
 


diff -ur mjpegtools-1.8.0.old/mplex/inputstrm.cpp mjpegtools-1.8.0/mplex/inputstrm.cpp
--- mjpegtools-1.8.0.old/mplex/inputstrm.cpp	2008-10-28 13:17:34.000000000 -0500
+++ mjpegtools-1.8.0/mplex/inputstrm.cpp	2008-10-28 13:56:15.000000000 -0500
@@ -21,6 +21,8 @@
  */
 
 
+#include <limits>
+
 #include <config.h>
 #include <assert.h>
 
@@ -72,7 +74,7 @@
     au(0),
 	muxinto( into ),
 	kind(_kind),
-    buffer_min(INT_MAX),
+    buffer_min(std::numeric_limits<int>::max()),
     buffer_max(1)
 {
 }

diff -ur mjpegtools-1.8.0.old/mplex/multiplexor.cpp mjpegtools-1.8.0/mplex/multiplexor.cpp
--- mjpegtools-1.8.0.old/mplex/multiplexor.cpp	2008-10-28 13:17:34.000000000 -0500
+++ mjpegtools-1.8.0/mplex/multiplexor.cpp	2008-10-28 13:59:51.000000000 -0500
@@ -19,6 +19,7 @@
  */
 
 #define STREAM_LOGGING
+#include <cstring>
 #include <config.h>
 #include <math.h>
 #include <stdlib.h>

diff -ur mjpegtools-1.8.0.old/mplex/padstrm.cpp mjpegtools-1.8.0/mplex/padstrm.cpp
--- mjpegtools-1.8.0.old/mplex/padstrm.cpp	2008-10-28 13:17:34.000000000 -0500
+++ mjpegtools-1.8.0/mplex/padstrm.cpp	2008-10-28 14:03:24.000000000 -0500
@@ -20,6 +20,8 @@
  */
 
 
+#include <cstring>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


diff -ur mjpegtools-1.8.0.old/mplex/main.cpp mjpegtools-1.8.0/mplex/main.cpp
--- mjpegtools-1.8.0.old/mplex/main.cpp	2008-10-28 13:17:34.000000000 -0500
+++ mjpegtools-1.8.0/mplex/main.cpp	2008-10-28 14:06:49.000000000 -0500
@@ -26,6 +26,7 @@
 *************************************************************************/
 
 #include <config.h>
+#include <cstring>
 #include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>