diff --git a/src/sm130/sm130.cxx b/src/sm130/sm130.cxx
index d4ba401b..fb84c11a 100644
--- a/src/sm130/sm130.cxx
+++ b/src/sm130/sm130.cxx
@@ -53,7 +53,7 @@ SM130::~SM130()
 {
 }
 
-mraa_result_t SM130::setBaudRate(int baud)
+mraa::Result SM130::setBaudRate(int baud)
 {
   m_baud = baud;
   return m_uart.setBaudRate(baud);
diff --git a/src/sm130/sm130.h b/src/sm130/sm130.h
index 2002c7ff..2665d5d5 100644
--- a/src/sm130/sm130.h
+++ b/src/sm130/sm130.h
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <mraa/common.hpp>
 #include <mraa/uart.hpp>
 #include <mraa/gpio.hpp>
 
@@ -171,9 +172,9 @@ namespace upm {
      * Sets the baud rate for the device.  The default is 19200.
      *
      * @param baud Desired baud rate, default 19200
-     * @return mraa_result_t value
+     * @return mraa::Result value
      */
-    mraa_result_t setBaudRate(int baud=19200);
+    mraa::Result setBaudRate(int baud=19200);
 
     /**
      * Gets the firmware version string.