diff --git a/rosserial_mbed/src/examples/ADC/makefile b/rosserial_mbed/src/examples/ADC/makefile
index 2bd85d575..9ea8ac91c 100644
--- a/rosserial_mbed/src/examples/ADC/makefile
+++ b/rosserial_mbed/src/examples/ADC/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_ADC
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/Blink/makefile b/rosserial_mbed/src/examples/Blink/makefile
index 35bb79a62..156ba0004 100644
--- a/rosserial_mbed/src/examples/Blink/makefile
+++ b/rosserial_mbed/src/examples/Blink/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_Blink
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/Clapper/makefile b/rosserial_mbed/src/examples/Clapper/makefile
index 9e1a30e46..90b164d36 100644
--- a/rosserial_mbed/src/examples/Clapper/makefile
+++ b/rosserial_mbed/src/examples/Clapper/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_Clapper
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/GroveBuzzer/makefile b/rosserial_mbed/src/examples/GroveBuzzer/makefile
index b896e5766..c5ab4e38c 100644
--- a/rosserial_mbed/src/examples/GroveBuzzer/makefile
+++ b/rosserial_mbed/src/examples/GroveBuzzer/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_grove_buzzer
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/GroveCollision/makefile b/rosserial_mbed/src/examples/GroveCollision/makefile
index f359ab81d..cc26a978f 100644
--- a/rosserial_mbed/src/examples/GroveCollision/makefile
+++ b/rosserial_mbed/src/examples/GroveCollision/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_grove_collision
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/GrovePIRMotionSensor/makefile b/rosserial_mbed/src/examples/GrovePIRMotionSensor/makefile
index 2e4a78d60..aef7150e2 100644
--- a/rosserial_mbed/src/examples/GrovePIRMotionSensor/makefile
+++ b/rosserial_mbed/src/examples/GrovePIRMotionSensor/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_pir_motion_sensor
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/GroveTemperatureHumidity/makefile b/rosserial_mbed/src/examples/GroveTemperatureHumidity/makefile
index fd036cd03..2d65da4c6 100644
--- a/rosserial_mbed/src/examples/GroveTemperatureHumidity/makefile
+++ b/rosserial_mbed/src/examples/GroveTemperatureHumidity/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_grove_temperature_humidity
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/HelloWorld/makefile b/rosserial_mbed/src/examples/HelloWorld/makefile
index f70cc9889..db5e0e4ca 100644
--- a/rosserial_mbed/src/examples/HelloWorld/makefile
+++ b/rosserial_mbed/src/examples/HelloWorld/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_HelloWorld
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/IrRanger/makefile b/rosserial_mbed/src/examples/IrRanger/makefile
index 32610d8e6..b0f39d891 100644
--- a/rosserial_mbed/src/examples/IrRanger/makefile
+++ b/rosserial_mbed/src/examples/IrRanger/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_IrRanger
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/Logging/makefile b/rosserial_mbed/src/examples/Logging/makefile
index 38ca105d7..312f51fb0 100644
--- a/rosserial_mbed/src/examples/Logging/makefile
+++ b/rosserial_mbed/src/examples/Logging/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_Logging
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/MotorShield/makefile b/rosserial_mbed/src/examples/MotorShield/makefile
index c376f4c5c..1548d6fef 100644
--- a/rosserial_mbed/src/examples/MotorShield/makefile
+++ b/rosserial_mbed/src/examples/MotorShield/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_motor_shield
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/Odom/makefile b/rosserial_mbed/src/examples/Odom/makefile
index ab0d1e6c6..53f3c4a0f 100644
--- a/rosserial_mbed/src/examples/Odom/makefile
+++ b/rosserial_mbed/src/examples/Odom/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_Odom
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/ServiceClient/makefile b/rosserial_mbed/src/examples/ServiceClient/makefile
index 1ffe3fb9c..756e4bad4 100644
--- a/rosserial_mbed/src/examples/ServiceClient/makefile
+++ b/rosserial_mbed/src/examples/ServiceClient/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_ServiceClient
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/ServiceServer/makefile b/rosserial_mbed/src/examples/ServiceServer/makefile
index f4966c5a1..fc017180b 100644
--- a/rosserial_mbed/src/examples/ServiceServer/makefile
+++ b/rosserial_mbed/src/examples/ServiceServer/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_ServiceServer
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/ServoControl/makefile b/rosserial_mbed/src/examples/ServoControl/makefile
index 982513258..55751c21b 100644
--- a/rosserial_mbed/src/examples/ServoControl/makefile
+++ b/rosserial_mbed/src/examples/ServoControl/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_ServoControl
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/Temperature/makefile b/rosserial_mbed/src/examples/Temperature/makefile
index e27a0747d..1cf7960c9 100644
--- a/rosserial_mbed/src/examples/Temperature/makefile
+++ b/rosserial_mbed/src/examples/Temperature/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_Temperature
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/TimeTF/makefile b/rosserial_mbed/src/examples/TimeTF/makefile
index 0412490e0..82220f74c 100644
--- a/rosserial_mbed/src/examples/TimeTF/makefile
+++ b/rosserial_mbed/src/examples/TimeTF/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_TimeTF
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/Ultrasound/makefile b/rosserial_mbed/src/examples/Ultrasound/makefile
index 55a75d5d6..e59cf215c 100644
--- a/rosserial_mbed/src/examples/Ultrasound/makefile
+++ b/rosserial_mbed/src/examples/Ultrasound/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_Ultrasound
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/button_example/makefile b/rosserial_mbed/src/examples/button_example/makefile
index 168603c9b..1fe2404d0 100644
--- a/rosserial_mbed/src/examples/button_example/makefile
+++ b/rosserial_mbed/src/examples/button_example/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_button_example
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1
 
diff --git a/rosserial_mbed/src/examples/pubsub/makefile b/rosserial_mbed/src/examples/pubsub/makefile
index b5d498633..002716542 100644
--- a/rosserial_mbed/src/examples/pubsub/makefile
+++ b/rosserial_mbed/src/examples/pubsub/makefile
@@ -1,7 +1,7 @@
 PROJECT         := rosserial_mbed_pubsub
 DEVICES         := LPC1768 KL25Z NUCLEO_F401RE
 GCC4MBED_DIR    := $(GCC4MBED_DIR)
-USER_LIBS       := $(ROS_LIB_DIR)
+USER_LIBS       := !$(ROS_LIB_DIR) $(ROS_LIB_DIR)/BufferedSerial
 NO_FLOAT_SCANF  := 1
 NO_FLOAT_PRINTF := 1