diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 025cd78271..6949d05d3d 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -220,13 +220,13 @@ def build(bld):
 	obj.uselib       += ' GTKMM GNOMECANVASMM'
 	obj.uselib_local = '''libpbd libmidipp libtaglib libardour libsurfaces
 	                      libgtkmm2ext libtaglib'''
-	obj.cxxflags     = '-DVERSIONSTRING=\\\"' + GTK2_ARDOUR_VERSION + '\\\"'
-	obj.cxxflags     += ' -DPACKAGE=\\\"gtk2_ardour\\\"'
-	obj.cxxflags     += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIRNAME']) + '\\\"'
-	obj.cxxflags     += ' -DCONFIG_DIR=\\\"' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '\\\"'
-	obj.cxxflags     += ' -DMODULE_DIR=\\\"' + os.path.normpath(bld.env['LIBDIRNAME']) + '\\\"'
-	obj.cxxflags     += ' -DLOCALEDIR=\\\"' + os.path.join(
-			os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
+	obj.cxxflags     = ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"']
+	obj.cxxflags     += ['-DPACKAGE="gtk2_ardour"']
+	obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIRNAME']) + '"']
+	obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '"']
+	obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"']
+	obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
+			os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
 	
 	# Wrappers
 
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index ad6faca671..342ca79a0a 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -218,14 +218,14 @@ def build(bld):
 	obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib'
 	obj.vnum         = LIBARDOUR_LIB_VERSION
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	obj.cxxflags     = ' -DPACKAGE=\\\"libardour3\\\"'
-	obj.cxxflags     += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIR']) + '\\\"'
-	obj.cxxflags     += ' -DCONFIG_DIR=\\\"' + os.path.normpath(bld.env['CONFIGDIR']) + '\\\"'
-	obj.cxxflags     += ' -DMODULE_DIR=\\\"' + os.path.normpath(bld.env['LIBDIR']) + '\\\"'
-	obj.cxxflags     += ' -DLOCALEDIR=\\\"' + os.path.join(
-			os.path.normpath(bld.env['DATADIR']), 'locale') + '\\\"'
-	obj.cxxflags     += ' -DVAMP_DIR=\\\"' + os.path.join(
-			os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '\\\"'
+	obj.cxxflags     = ['-DPACKAGE="libardour3"']
+	obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+	obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+	obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
+	obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
+			os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
+	obj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
+			os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
 	obj.source += ' rb_effect.cc '
 	obj.uselib_local += ' librubberband '
 	#obj.source += ' st_stretch.cc st_pitch.cc '
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index c9b400720b..20a2088d17 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -53,7 +53,7 @@ def build(bld):
 		src/libsmf/smf_tempo.c
 	'''
 	libsmf.export_incdirs = ['./src/libsmf']
-	libsmf.defines      = 'SMF_VERSION=\\\"1.2\\\"'
+	libsmf.defines      = 'SMF_VERSION="1.2"'
 	libsmf.includes     = ['./src']
 	libsmf.name         = 'libsmf'
 	libsmf.target       = 'smf'
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 48a21a71e2..81c0dfbacd 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -70,9 +70,10 @@ def build(bld):
 	obj.uselib_local = 'libpbd'
 	obj.vnum         = GTKMM2EXT_LIB_VERSION
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	obj.cxxflags     = '-DPACKAGE=\\\"libgtkmm2ext\\\"'
-	obj.cxxflags     += ' -DLOCALEDIR=\\\"' + os.path.join(
-			os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
+	obj.cxxflags     = [
+			'-DPACKAGE="libgtkmm2ext"',
+			'-DLOCALEDIR="' + os.path.join(
+				os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
 
 def shutdown():
 	autowaf.shutdown()
diff --git a/libs/pbd/gettext.h b/libs/pbd/gettext.h
index 339c74ffe7..2645402e95 100644
--- a/libs/pbd/gettext.h
+++ b/libs/pbd/gettext.h
@@ -20,7 +20,7 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#ifdef ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>
diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc
index e85a299e0b..cdc4ccea8d 100644
--- a/libs/pbd/mountpoint.cc
+++ b/libs/pbd/mountpoint.cc
@@ -32,7 +32,7 @@ using std::string;
 #include "wafconfig.h"
 #endif
 
-#if HAVE_GETMNTENT
+#ifdef HAVE_GETMNTENT
 #include <mntent.h>
 
 struct mntent_sorter {
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 4c69934baf..5e21f8ce7d 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -91,9 +91,9 @@ def build(bld):
 	obj.uselib       = 'GLIBMM SIGCPP XML UUID'
 	obj.vnum         = LIBPBD_LIB_VERSION
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	obj.cxxflags     = '-DPACKAGE=\\\"libpbd\\\"'
+	obj.cxxflags     = ['-DPACKAGE="libpbd"']
 	if bld.env['PBD_HAVE_EXECINFO']:
-		obj.cxxflags += ' -DHAVE_EXECINFO '
+		obj.cxxflags += ['-DHAVE_EXECINFO']
 	
 def shutdown():
 	autowaf.shutdown()
diff --git a/libs/rubberband/wscript b/libs/rubberband/wscript
index 2ef9155dfb..b5f0e2ad7a 100644
--- a/libs/rubberband/wscript
+++ b/libs/rubberband/wscript
@@ -58,7 +58,7 @@ def build(bld):
 	obj.uselib_local = 'libvamphost'
 	obj.vnum         = LIBRUBBERBAND_LIB_VERSION
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	obj.cxxflags     = '-DPACKAGE=\\\"librubberband\\\"'
+	obj.cxxflags     = '-DPACKAGE="librubberband"'
 	
 def shutdown():
 	autowaf.shutdown()
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 78a674b375..7994bcf77e 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -26,7 +26,7 @@ def build(bld):
 		smpte.cc
 	'''
 	obj.export_incdirs = ['.']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_cp\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_cp"'
 	obj.includes     = ['.']
 	obj.name         = 'libsurfaces'
 	obj.target       = 'surfaces'
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 5fea9631dd..d063008a78 100644
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -34,7 +34,7 @@ def build(bld):
 		midicontrollable.cc
 	'''
 	obj.export_incdirs = ['./generic_midi']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_genericmidi\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
 	obj.includes     = ['.', './generic_midi']
 	obj.name         = 'libgeneric_midi'
 	obj.target       = 'generic_midi'
diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index f0b245040a..81a8bda792 100644
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -26,7 +26,7 @@ def build(bld):
 		midicontrollable.cc
 	'''
 	obj.export_incdirs = ['./generic_midi']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_genericmidi\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
 	obj.includes     = ['.', './generic_midi']
 	obj.name         = 'libgeneric_midi'
 	obj.target       = 'generic_midi'
diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index 6225ae42e7..e8d5216694 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -41,7 +41,7 @@ def build(bld):
 		types.cc
 	'''
 	obj.export_incdirs = ['./mackie']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_mackie\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
 	obj.includes     = ['.', './mackie']
 	obj.name         = 'libmackie'
 	obj.target       = 'mackie'
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index 74e21fa3a8..95566b9339 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -33,7 +33,7 @@ def build(bld):
 		interface.cc
 	'''
 	obj.export_incdirs = ['./osc']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_cp\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_cp"'
 	obj.includes     = ['.', './osc']
 	obj.name         = 'libsurfaces'
 	obj.target       = 'surfaces'
diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript
index 95aeb7e9f6..2ce356b0f4 100644
--- a/libs/surfaces/powermate/wscript
+++ b/libs/surfaces/powermate/wscript
@@ -25,7 +25,7 @@ def build(bld):
 		powermate.cc
 	'''
 	obj.export_incdirs = ['./powermate']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_powermate\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_powermate"'
 	obj.includes     = ['.', './powermate']
 	obj.name         = 'libpowermate'
 	obj.target       = 'powermate'
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index e6ee417140..d6ab02471a 100644
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -39,7 +39,7 @@ def build(bld):
 		wheel_modes.cc
 	'''
 	obj.export_incdirs = ['./tranzport']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_tranzport\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_tranzport"'
 	obj.includes     = ['.', './tranzport']
 	obj.name         = 'libtranzport'
 	obj.target       = 'tranzport'
diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 6136d7b685..b5c6e1cd28 100644
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -25,7 +25,7 @@ def build(bld):
 		interface.cc
 	'''
 	obj.export_incdirs = ['./wiimote']
-	obj.cxxflags     = '-DPACKAGE=\\\"ardour_wiimote\\\"'
+	obj.cxxflags     = '-DPACKAGE="ardour_wiimote"'
 	obj.includes     = ['.', './wiimote']
 	obj.name         = 'libwiimote'
 	obj.target       = 'wiimote'
diff --git a/waf b/waf
index 1c066b9a95..924d0e6aa5 100755
Binary files a/waf and b/waf differ