diff --git a/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino b/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino
index 18bfc22..efb1065 100644
--- a/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino
+++ b/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino
@@ -66,8 +66,11 @@
 #define USE_SERVOS  // Enable use of PWM servos as defined in servos.h
 //#undef USE_SERVOS     // Disable use of PWM servos
 
-/* Serial port baud rate */
-#define BAUDRATE     57600
+/* Include servo support if required */
+#ifdef USE_SERVOS
+   #include <Servo.h>
+   #include "servos.h"
+#endif
 
 /* Maximum PWM signal */
 #define MAX_PWM        255
@@ -84,12 +87,6 @@
 /* Sensor functions */
 #include "sensors.h"
 
-/* Include servo support if required */
-#ifdef USE_SERVOS
-   #include <Servo.h>
-   #include "servos.h"
-#endif
-
 #ifdef USE_BASE
   /* Motor driver function definitions */
   #include "motor_driver.h"
@@ -116,6 +113,7 @@
 #endif
 
 /* Variable initialization */
+#define BAUDRATE     57600
 
 // A pair of varibles to help parse serial commands (thanks Fergs)
 int arg = 0;