diff --git a/desmume/ChangeLog b/desmume/ChangeLog
index 4a07f3cd1..cbbdd927f 100644
--- a/desmume/ChangeLog
+++ b/desmume/ChangeLog
@@ -9,6 +9,8 @@
  - Added option to disable execution upon loading. [Jeff B]
  - Many more strings are translatable now. [Jeff B]
  - Default screen color now black (better represents being "off" and easier on eyes at night) [Jeff B]
+ general:
+ - Fixed possible segfault in ROMReader on ia64 and amd64. [evilynux]
 
 0.7.2 -> 0.7.3
  gtk-glade:
diff --git a/desmume/src/ROMReader.h b/desmume/src/ROMReader.h
index 0060cee44..a606a5cbf 100644
--- a/desmume/src/ROMReader.h
+++ b/desmume/src/ROMReader.h
@@ -17,6 +17,11 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+#include <string.h>
+
 #include "types.h"
 
 #define ROMREADER_DEFAULT -1