diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4890bfd..894f0a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,6 +4,11 @@ set (mraa_LIB_INCLUDE_DIRS
   ${PROJECT_SOURCE_DIR}/include
 )
 
+if (FIRMATA)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFIRMATA=1")
+  add_subdirectory (firmata)
+endif ()
+
 include_directories(
   ${mraa_LIB_INCLUDE_DIRS}
 )
@@ -17,6 +22,7 @@ set (mraa_LIB_SRCS_NOAUTO
   ${PROJECT_SOURCE_DIR}/src/aio/aio.c
   ${PROJECT_SOURCE_DIR}/src/uart/uart.c
   ${PROJECT_SOURCE_DIR}/src/iio/iio.c
+  ${mraa_LIB_SRCS_NOAUTO}
 )
 
 set (mraa_LIB_X86_SRCS_NOAUTO
@@ -106,11 +112,6 @@ if (USBPLAT)
   add_subdirectory(usb)
 endif ()
 
-if (FIRMATA)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFIRMATA=1")
-  add_subdirectory (firmata)
-endif ()
-
 if (IMRAA)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIMRAA=1")
   find_package (JSON-C REQUIRED)
diff --git a/src/firmata/CMakeLists.txt b/src/firmata/CMakeLists.txt
index 8d6c9ab..8ebc433 100644
--- a/src/firmata/CMakeLists.txt
+++ b/src/firmata/CMakeLists.txt
@@ -1,9 +1,8 @@
 if (FIRMATA)
   message (STATUS "INFO - Adding firmata backend support")
-  set (mraa_LIB_PLAT_SRCS_NOAUTO ${mraa_LIB_PLAT_SRCS_NOAUTO}
+  set (mraa_LIB_SRCS_NOAUTO ${mraa_LIB_SRCS_NOAUTO}
     ${PROJECT_SOURCE_DIR}/src/firmata/firmata.c
     ${PROJECT_SOURCE_DIR}/src/firmata/firmata_mraa.c
     PARENT_SCOPE
   )
-  message (${mraa_LIB_PLAT_SRCS_NOAUTO})
 endif ()
diff --git a/src/javascript/binding.gyp.cmake b/src/javascript/binding.gyp.cmake
index 4675e26..1285c23 100644
--- a/src/javascript/binding.gyp.cmake
+++ b/src/javascript/binding.gyp.cmake
@@ -28,6 +28,8 @@
       ],
       'defines' : [ 'SWIG',
                     'SWIGJAVASCRIPT',
+                    'IMRAA=ON',
+                    'FIRMATA=ON',
                     'BUILDING_NODE_EXTENSION=1',
                     'SWIG_V8_VERSION=0x0<(v8_version)',
                     'V8_VERSION=0x0<(v8_version)'