diff --git a/merrifield/common/utils/HwcTrace.h b/merrifield/common/utils/HwcTrace.h
index 83151c6..2eb47a2 100644
--- a/merrifield/common/utils/HwcTrace.h
+++ b/merrifield/common/utils/HwcTrace.h
@@ -26,11 +26,11 @@
 #endif
 
 // Helper to automatically preappend classname::functionname to the log message
-#define VTRACE(fmt,...)     ALOGV("%s: "fmt, __func__, ##__VA_ARGS__)
-#define DTRACE(fmt,...)     ALOGD("%s: "fmt, __func__, ##__VA_ARGS__)
-#define ITRACE(fmt,...)     ALOGI("%s: "fmt, __func__, ##__VA_ARGS__)
-#define WTRACE(fmt,...)     ALOGW("%s: "fmt, __func__, ##__VA_ARGS__)
-#define ETRACE(fmt,...)     ALOGE("%s: "fmt, __func__, ##__VA_ARGS__)
+#define VTRACE(fmt,...)     ALOGV("%s: " fmt, __func__, ##__VA_ARGS__)
+#define DTRACE(fmt,...)     ALOGD("%s: " fmt, __func__, ##__VA_ARGS__)
+#define ITRACE(fmt,...)     ALOGI("%s: " fmt, __func__, ##__VA_ARGS__)
+#define WTRACE(fmt,...)     ALOGW("%s: " fmt, __func__, ##__VA_ARGS__)
+#define ETRACE(fmt,...)     ALOGE("%s: " fmt, __func__, ##__VA_ARGS__)
 
 
 // Function call tracing
diff --git a/merrifield/ips/common/WsbmWrapper.c b/merrifield/ips/common/WsbmWrapper.c
index 5e4161e..5e050a4 100644
--- a/merrifield/ips/common/WsbmWrapper.c
+++ b/merrifield/ips/common/WsbmWrapper.c
@@ -14,6 +14,7 @@
 // limitations under the License.
 */
 
+#include <string.h>
 #include <wsbm_pool.h>
 #include <wsbm_driver.h>
 #include <wsbm_manager.h>