diff --git a/rsContext.cpp b/rsContext.cpp
index 5e21763..a2d8129 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -29,7 +29,6 @@
 #include <cutils/properties.h>
 
 #include <sys/syscall.h>
-#include <string.h>
 
 using namespace android;
 using namespace android::renderscript;
@@ -77,7 +76,7 @@
 
 
 uint32_t Context::runScript(Script *s) {
-    PushState(this);
+    PushState ps(this);
 
     uint32_t ret = s->run(this);
     return ret;
diff --git a/rsContext.h b/rsContext.h
index de110c6..b071dc0 100644
--- a/rsContext.h
+++ b/rsContext.h
@@ -30,6 +30,7 @@
 #include "rsProgramRaster.h"
 #include "rsProgramVertex.h"
 #include "rsFBOCache.h"
+#include <string.h>
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/rsg_generator.c b/rsg_generator.c
index c0f82dc..c404c9c 100644
--- a/rsg_generator.c
+++ b/rsg_generator.c
@@ -1,6 +1,7 @@
 
 #include "spec.h"
 #include <stdio.h>
+#include <string.h>
 
 void printFileHeader(FILE *f) {
     fprintf(f, "/*\n");