diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript
index a16f493475..262dc7613e 100644
--- a/libs/panners/1in2out/wscript
+++ b/libs/panners/1in2out/wscript
@@ -15,7 +15,6 @@ def configure(conf):
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.source = [ 'panner_1in2out.cc' ]
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="libardour_pan1in2out"' ]
     obj.defines     += [ 'ARDOURPANNER_DLL_EXPORTS' ]
     obj.includes     = ['.']
diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript
index 1ec2fab1c2..f09e4369c1 100644
--- a/libs/panners/2in2out/wscript
+++ b/libs/panners/2in2out/wscript
@@ -15,7 +15,6 @@ def configure(conf):
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.source = [ 'panner_2in2out.cc' ]
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="libardour_pan2in2out"' ]
     obj.defines     += [ 'ARDOURPANNER_DLL_EXPORTS' ]
     obj.includes     = ['.']
diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript
index e2a08216dd..7cc81e9ca0 100644
--- a/libs/panners/stereobalance/wscript
+++ b/libs/panners/stereobalance/wscript
@@ -15,7 +15,6 @@ def configure(conf):
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.source = [ 'panner_balance.cc' ]
-    obj.export_includes = ['.']
     obj.defines      = ['PACKAGE="libardour_panbalance"']
     obj.defines     += ['ARDOURPANNER_DLL_EXPORTS']
     obj.includes     = ['.']
diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript
index 7526cf0a2c..f590a015ca 100644
--- a/libs/panners/vbap/wscript
+++ b/libs/panners/vbap/wscript
@@ -15,7 +15,6 @@ def configure(conf):
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.source = [ 'vbap_speakers.cc', 'vbap.cc'  ]
-    obj.export_includes = ['.']
     obj.defines      = ['PACKAGE="libardour_panvbap"']
     obj.defines     += ['ARDOURPANNER_DLL_EXPORTS']
     obj.includes     = ['.']
diff --git a/libs/surfaces/cc121/wscript b/libs/surfaces/cc121/wscript
index 0c57c9ed1b..6b6574c919 100644
--- a/libs/surfaces/cc121/wscript
+++ b/libs/surfaces/cc121/wscript
@@ -20,7 +20,6 @@ def build(bld):
             cc121_interface.cc
             operations.cc
     '''
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="ardour_cc121"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = [ '.', './cc121']
diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript
index 23db001797..c582ac2e02 100644
--- a/libs/surfaces/contourdesign/wscript
+++ b/libs/surfaces/contourdesign/wscript
@@ -21,7 +21,6 @@ def build(bld):
             button_config_widget.cc
             interface.cc
     '''
-    obj.export_includes = ['./contourdesign']
     obj.defines      = [ 'PACKAGE="ardour_contourdesign"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', '../libs', '../../widgets']
diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript
index c442bb78d9..a38ee983b2 100644
--- a/libs/surfaces/faderport/wscript
+++ b/libs/surfaces/faderport/wscript
@@ -20,7 +20,6 @@ def build(bld):
             faderport_interface.cc
             operations.cc
     '''
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="ardour_faderport"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = [ '.', './faderport']
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 63385e6795..111e723d2d 100644
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -20,7 +20,6 @@ def build(bld):
             interface.cc
             midicontrollable.cc
     '''
-    obj.export_includes = ['./generic_midi']
     obj.defines      = [ 'PACKAGE="ardour_frontier"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', './generic_midi']
diff --git a/libs/surfaces/launch_control_xl/wscript b/libs/surfaces/launch_control_xl/wscript
index 5844176d7b..4ac93a0757 100644
--- a/libs/surfaces/launch_control_xl/wscript
+++ b/libs/surfaces/launch_control_xl/wscript
@@ -22,7 +22,6 @@ def build(bld):
         leds.cc
         gui.cc
     '''
-    obj.export_includes = ['.']
     obj.defines = ['PACKAGE="ardour_launch_control_xl"']
     obj.defines += ['ARDOURSURFACE_DLL_EXPORTS']
     obj.defines += ['VERSIONSTRING="' + bld.env['VERSION'] + '"']
diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index 0c2e56b2fb..1a6fa91cb5 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -36,7 +36,6 @@ def build(bld):
             surface_port.cc
             types.cc
     '''
-    obj.export_includes = ['./mackie']
     obj.defines      = [ 'PACKAGE="ardour_mackie"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = [ '.' ]
diff --git a/libs/surfaces/maschine2/wscript b/libs/surfaces/maschine2/wscript
index 40e8ecbc9a..34f4e6d702 100644
--- a/libs/surfaces/maschine2/wscript
+++ b/libs/surfaces/maschine2/wscript
@@ -28,7 +28,6 @@ def build(bld):
             ui_knob.cc
             ui_menu.cc
     '''
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="ardour_maschine2"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.defines     += [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"' ]
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index c4d2c7ca3f..c1d3348f71 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -24,7 +24,6 @@ def build(bld):
             interface.cc
             osc_gui.cc
     '''
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="ardour_osc"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', './osc']
diff --git a/libs/surfaces/push2/wscript b/libs/surfaces/push2/wscript
index d9074ab38e..26a5f10a49 100644
--- a/libs/surfaces/push2/wscript
+++ b/libs/surfaces/push2/wscript
@@ -34,7 +34,6 @@ def build(bld):
             track_mix.cc
             utils.cc
     '''
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="ardour_push2"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.defines     += [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"' ]
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index 9374a20cf2..3f94a6d794 100644
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -32,7 +32,6 @@ def build(bld):
             wheel.cc
             wheel_modes.cc
     '''
-    obj.export_includes = ['./tranzport']
     obj.defines      = [ 'PACKAGE="ardour_tranzport"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', './tranzport']
diff --git a/libs/surfaces/us2400/wscript b/libs/surfaces/us2400/wscript
index a159bddc2d..df72af180a 100644
--- a/libs/surfaces/us2400/wscript
+++ b/libs/surfaces/us2400/wscript
@@ -35,7 +35,6 @@ def build(bld):
             surface_port.cc
             types.cc
     '''
-    obj.export_includes = ['./us2400']
     obj.defines      = [ 'PACKAGE="ardour_us2400"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = [ '.' ]
diff --git a/libs/surfaces/websockets/wscript b/libs/surfaces/websockets/wscript
index 4ce0772fa0..a9b839b07c 100644
--- a/libs/surfaces/websockets/wscript
+++ b/libs/surfaces/websockets/wscript
@@ -31,7 +31,6 @@ def build(bld):
             resources.cc
             json.cc
     '''
-    obj.export_includes = ['.']
     obj.defines      = [ 'PACKAGE="ardour_websockets"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', './websockets']
diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index fd904b9c79..48abca02cb 100644
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -18,7 +18,6 @@ def build(bld):
             wiimote.cc
             interface.cc
     '''
-    obj.export_includes = ['./wiimote']
     obj.defines      = [ 'PACKAGE="ardour_wiimote"' ]
     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', '../libs']