diff --git a/src/ims/CMakeLists.txt b/src/ims/CMakeLists.txt
index 3765fa87..7f2c490e 100644
--- a/src/ims/CMakeLists.txt
+++ b/src/ims/CMakeLists.txt
@@ -1,6 +1,6 @@
 upm_mixed_module_init (NAME ims
     DESCRIPTION "I2C Moisture Sensor"
-    C_HDR ims.h
+    C_HDR ims.h ims_defs.h
     C_SRC ims.c
     CPP_HDR ims.hpp
     CPP_SRC ims.cxx
diff --git a/src/ims/ims.h b/src/ims/ims.h
index 07af1302..f02d76ab 100644
--- a/src/ims/ims.h
+++ b/src/ims/ims.h
@@ -30,40 +30,12 @@
 #include "mraa/i2c.h"
 #include "upm.h"
 
+#include "ims_defs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define IMS_ADDRESS_DEFAULT 0x20
-
- /* @brief Moisture sensor I2C READ commands */
-typedef enum _IMS_RD_COMMAND {
-        /* Read capacitance (moisture) register */
-        IMS_GET_CAPACITANCE = 0x00, /*    (r) 2 */
-        /* Read I2C address register */
-        IMS_GET_ADDRESS     = 0x02, /*    (r) 1 */
-        /* Read light register (requires write to IMS_MEASURE_LIGHT) */
-        IMS_GET_LIGHT       = 0x04, /*    (r) 2 */
-        /* Read temperature register */
-        IMS_GET_TEMPERATURE = 0x05, /*    (r) 2 */
-        /* Read version register */
-        IMS_GET_VERSION     = 0x07, /*    (r) 1 */
-        /* Read busy register (0 = ready, 1 = sampling) */
-        IMS_GET_BUSY        = 0x09, /*    (r) 1 */
-} IMS_RD_COMMAND;
-
- /* @brief Moisture sensor I2C WRITE commands */
-typedef enum {
-        /* Write I2C address register (latched w/IMS_RESET) */
-        IMS_SET_ADDRESS     = 0x01, /*    (w) 1 */
-        /* Initiate light measurement */
-        IMS_MEASURE_LIGHT   = 0x03, /*    (w) 0 */
-        /* Reset device */
-        IMS_RESET           = 0x06, /*    (w) 0 */
-        /* Sleep microcontroller, wake on any I2C request */
-        IMS_SLEEP           = 0x08, /*    (w) 0 */
-} IMS_WR_COMMAND;
-
 /**
  * @file ims.h
  * @library ims
diff --git a/src/ims/ims.hpp b/src/ims/ims.hpp
index d9910e29..b80277ce 100644
--- a/src/ims/ims.hpp
+++ b/src/ims/ims.hpp
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include "mraa/i2c.h"
 #include "ims.h"
 
 namespace upm {
diff --git a/src/ims/ims_defs.h b/src/ims/ims_defs.h
new file mode 100644
index 00000000..0eb33587
--- /dev/null
+++ b/src/ims/ims_defs.h
@@ -0,0 +1,64 @@
+/*
+ * Author: Noel Eck <noel.eck@intel.com>
+ * Copyright (c) 2015 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IMS_ADDRESS_DEFAULT 0x20
+
+ /* @brief Moisture sensor I2C READ commands */
+typedef enum _IMS_RD_COMMAND {
+        /* Read capacitance (moisture) register */
+        IMS_GET_CAPACITANCE = 0x00, /*    (r) 2 */
+        /* Read I2C address register */
+        IMS_GET_ADDRESS     = 0x02, /*    (r) 1 */
+        /* Read light register (requires write to IMS_MEASURE_LIGHT) */
+        IMS_GET_LIGHT       = 0x04, /*    (r) 2 */
+        /* Read temperature register */
+        IMS_GET_TEMPERATURE = 0x05, /*    (r) 2 */
+        /* Read version register */
+        IMS_GET_VERSION     = 0x07, /*    (r) 1 */
+        /* Read busy register (0 = ready, 1 = sampling) */
+        IMS_GET_BUSY        = 0x09, /*    (r) 1 */
+} IMS_RD_COMMAND;
+
+ /* @brief Moisture sensor I2C WRITE commands */
+typedef enum {
+        /* Write I2C address register (latched w/IMS_RESET) */
+        IMS_SET_ADDRESS     = 0x01, /*    (w) 1 */
+        /* Initiate light measurement */
+        IMS_MEASURE_LIGHT   = 0x03, /*    (w) 0 */
+        /* Reset device */
+        IMS_RESET           = 0x06, /*    (w) 0 */
+        /* Sleep microcontroller, wake on any I2C request */
+        IMS_SLEEP           = 0x08, /*    (w) 0 */
+} IMS_WR_COMMAND;
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/ims/javaupm_ims.i b/src/ims/javaupm_ims.i
index bec614ff..95d4df9f 100644
--- a/src/ims/javaupm_ims.i
+++ b/src/ims/javaupm_ims.i
@@ -5,7 +5,7 @@
     #include "ims.hpp"
 %}
 
-%include "ims.h"
+%include "ims_defs.h"
 %include "ims.hpp"
 
 %pragma(java) jniclasscode=%{
diff --git a/src/ims/jsupm_ims.i b/src/ims/jsupm_ims.i
index d6523472..962e96b1 100644
--- a/src/ims/jsupm_ims.i
+++ b/src/ims/jsupm_ims.i
@@ -5,5 +5,5 @@
     #include "ims.hpp"
 %}
 
-%include "ims.h"
+%include "ims_defs.h"
 %include "ims.hpp"
diff --git a/src/ims/pyupm_ims.i b/src/ims/pyupm_ims.i
index c1c32535..c4f2bee9 100644
--- a/src/ims/pyupm_ims.i
+++ b/src/ims/pyupm_ims.i
@@ -9,5 +9,5 @@
     #include "ims.hpp"
 %}
 
-%include "ims.h"
+%include "ims_defs.h"
 %include "ims.hpp"