diff --git a/MAC/APL/RTDBCommon/src/Makefile.am b/MAC/APL/RTDBCommon/src/Makefile.am
index 602482ad3765f4e8ef479a92607cfa440aa56a53..608db06e9118ffa71b155f971c6ef866adb9efaf 100644
--- a/MAC/APL/RTDBCommon/src/Makefile.am
+++ b/MAC/APL/RTDBCommon/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DUSES_NEW_IOSTREAM
+AM_CPPFLAGS = -DUSES_NEW_IOSTREAMS
 AUTOGEN = autogen
 SUFFIXES = .ph
 %.ph: %.prot
diff --git a/MAC/APL/StationCU/src/Makefile.am b/MAC/APL/StationCU/src/Makefile.am
index 710331f309df4a05e8d4d591e4eb5ed9444dd11d..be77b4387e5e0833ec66df3ef4087967ae8da2b4 100644
--- a/MAC/APL/StationCU/src/Makefile.am
+++ b/MAC/APL/StationCU/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DUSES_NEW_IOSTREAM
+AM_CPPFLAGS = -DUSES_NEW_IOSTREAMS
 lib_LTLIBRARIES = libstationcu.la
 libstationcu_la_SOURCES = Package__Version.cc
 
diff --git a/MAC/GCF/PVSS/src/Makefile.am b/MAC/GCF/PVSS/src/Makefile.am
index f8076dad85633abcc90826d41432f422aa6828d5..6738edf886e36a999913f229fddb31d05a6331e0 100644
--- a/MAC/GCF/PVSS/src/Makefile.am
+++ b/MAC/GCF/PVSS/src/Makefile.am
@@ -22,7 +22,7 @@ libgcfpvss_la_SOURCES= Package__Version.cc $(NODOCHDRS) \
 					  PVSSinfo.cc \
 					  PVSSservice.cc
 
-AM_CPPFLAGS = -DUSES_NEW_IOSTREAM -DLOFARLOGGER_SUBPACKAGE=\"PVSS\"
+AM_CPPFLAGS = -DUSES_NEW_IOSTREAMS -DLOFARLOGGER_SUBPACKAGE=\"PVSS\"
 		
 bin_PROGRAMS = versiongcfpvss
 
diff --git a/MAC/GCF/RTDB/src/Makefile.am b/MAC/GCF/RTDB/src/Makefile.am
index 5b8acb9792fa3f9b463a368e16c517094f5d4b52..079fc04325aa86fbef725a497f2223d5816e45f3 100644
--- a/MAC/GCF/RTDB/src/Makefile.am
+++ b/MAC/GCF/RTDB/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS 		= -DUSES_NEW_IOSTREAM -I$(top_builddir)/include
+AM_CPPFLAGS 		= -DUSES_NEW_IOSTREAMS -I$(top_builddir)/include
 AUTOGEN 			= autogen
 SUFFIXES 			= .ph
 %.cc: %.prot