diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am
index 8b6ca3c74..72aaf573a 100644
--- a/lib/libdvbsub/Makefile.am
+++ b/lib/libdvbsub/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 	@SIGC_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
-AM_CPPFLAGS += -fno-rtti -fno-exceptions
+AM_CPPFLAGS += -fno-rtti -fno-exceptions -D__STDC_LIMIT_MACROS
 
 noinst_LIBRARIES = libdvbsub.a
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e1cab9d9..5064ca4b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ BUILT_SOURCES = rcsim.h
 rcsim.h: $(srcdir)/driver/rcinput.h $(srcdir)/create_rcsim_h.sh
 	pushd $(srcdir) && sh ./create_rcsim_h.sh > $@
 
-AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
+AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
 SUBDIRS = zapit gui daemonc driver system eitd timerd nhttpd
 
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index aadefd977..6a850691d 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
+AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
 SUBDIRS = pictureviewer audiodec
 
diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am
index b49f0cdb9..bad7bf015 100644
--- a/src/driver/audiodec/Makefile.am
+++ b/src/driver/audiodec/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -fno-rtti -fno-exceptions
+AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_LIMIT_MACROS
 
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am
index acfa5096a..ef591d395 100644
--- a/src/driver/pictureviewer/Makefile.am
+++ b/src/driver/pictureviewer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -fno-rtti -fno-exceptions
+AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_LIMIT_MACROS
 
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 5e4f0e486..4ffbab759 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -fno-rtti -D__STDC_FORMAT_MACROS
-#AM_CPPFLAGS = -fno-rtti
+AM_CPPFLAGS = -fno-rtti -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 BUILT_SOURCES = version.h
 version.h:
 	@rm -f $@; \