diff --git a/lib/libnet/Makefile.am b/lib/libnet/Makefile.am
index 954edb310..ac17412c3 100644
--- a/lib/libnet/Makefile.am
+++ b/lib/libnet/Makefile.am
@@ -1,9 +1,6 @@
 noinst_LIBRARIES = libtuxbox-net.a
 
-#not allowed cppflags for c files - fix your code to re-enable
-#AM_CPPFLAGS = -fno-rtti -fno-exceptions
-
-AM_CPPFLAGS =
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 libtuxbox_net_a_SOURCES = libnet.c network_interfaces.cpp
 
diff --git a/lib/xmltree/Makefile.am b/lib/xmltree/Makefile.am
index 7f66c52b5..fc2d4201e 100644
--- a/lib/xmltree/Makefile.am
+++ b/lib/xmltree/Makefile.am
@@ -1,9 +1,6 @@
 INCLUDES = -I$(srcdir)/xmltok
 
-#not allowed cppflags for c files - fix your code to re-enable
-#AM_CPPFLAGS = -fno-rtti -fno-exceptions
-
-AM_CPPFLAGS =
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 noinst_LIBRARIES = libtuxbox-xmltree.a
 
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index ecdd8f9cb..5cc44bb51 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -1,7 +1,4 @@
-#not allowed cppflags for c files - fix your code to re-enable
-#AM_CPPFLAGS = -fno-rtti -fno-exceptions
-
-AM_CPPFLAGS =
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 SUBDIRS = pictureviewer audiodec
 
diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am
index 615e72346..4c39180b7 100644
--- a/src/driver/audiodec/Makefile.am
+++ b/src/driver/audiodec/Makefile.am
@@ -1,7 +1,4 @@
-#not allowed cppflags for c files - fix your code to re-enable
-#AM_CPPFLAGS = -fno-rtti -fno-exceptions
-
-AM_CPPFLAGS =
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
 	-I$(top_srcdir)/src \
diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am
index 5c28f9a4f..ca9bbba37 100644
--- a/src/driver/pictureviewer/Makefile.am
+++ b/src/driver/pictureviewer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -fno-rtti -fno-exceptions
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
 	-I$(top_srcdir)/src \
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index 83ddaaef6..0e010ed4c 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -1,7 +1,4 @@
-#not allowed cppflags for c files - fix your code to re-enable
-#AM_CPPFLAGS = -fno-rtti -fno-exceptions
-
-AM_CPPFLAGS =
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
 	-I$(top_srcdir)/lib \