diff --git a/cc3200/makefile.inc b/cc3200/makefile.inc
index de8e286..e6bd22e 100644
--- a/cc3200/makefile.inc
+++ b/cc3200/makefile.inc
@@ -33,6 +33,7 @@ CFLAGS+=-Wall
 #
 # Where to find header files that do not live in the source directory.
 #
+IPATH+=$(PARSE_CC3200_SDK_ROOT)/src
 IPATH+=${CC3200_SDK_ROOT}/simplelink/include
 IPATH+=${CC3200_SDK_ROOT}/driverlib
 IPATH+=${CC3200_SDK_ROOT}/oslib
diff --git a/cc3200/src/makefile b/cc3200/src/makefile
index cdfd5f5..ca55076 100644
--- a/cc3200/src/makefile
+++ b/cc3200/src/makefile
@@ -44,19 +44,21 @@ ${BINDIR}:
 # Rules for building the Simplelink library with os support.
 #
 ${TARGET}: \
+  ${OBJDIR}/certificate_file.o \
+  ${OBJDIR}/client_state.o \
+  ${OBJDIR}/debug.o \
+  ${OBJDIR}/socket.o \
+  ${OBJDIR}/utils.o \
+  \
+  ${OBJDIR}/certificate.o \
   ${OBJDIR}/http.o \
   ${OBJDIR}/installation.o \
   ${OBJDIR}/parse_impl.o \
   ${OBJDIR}/push.o \
   ${OBJDIR}/request.o \
   ${OBJDIR}/session.o \
-  ${OBJDIR}/simplejson.o \
   \
-  ${OBJDIR}/cc3200_certificate.o \
-  ${OBJDIR}/cc3200_client_state.o \
-  ${OBJDIR}/cc3200_debug.o \
-  ${OBJDIR}/cc3200_socket.o \
-  ${OBJDIR}/cc3200_utils.o \
+  ${OBJDIR}/simplejson.o \
 
 
 #
diff --git a/makefile.inc b/makefile.inc
index 812330b..4a08250 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -21,10 +21,12 @@ PARSE_SDK_ROOT:=$(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 # Where to find header files that do not live in the source directory.
 #
 IPATH+=$(PARSE_SDK_ROOT)/include
+IPATH+=$(PARSE_SDK_ROOT)/rtos
 IPATH+=$(PARSE_SDK_ROOT)/common
 
 
 #
 # Where to find source files that do not live in this directory.
 #
+VPATH+=$(PARSE_SDK_ROOT)/rtos
 VPATH+=$(PARSE_SDK_ROOT)/common