diff --git a/cpu_ref/rsCpuIntrinsic.cpp b/cpu_ref/rsCpuIntrinsic.cpp
index 4cb3f9f..6f642b2 100644
--- a/cpu_ref/rsCpuIntrinsic.cpp
+++ b/cpu_ref/rsCpuIntrinsic.cpp
@@ -17,8 +17,8 @@
 
 #include "rsCpuIntrinsic.h"
 
-using namespace android;
-using namespace android::renderscript;
+namespace android {
+namespace renderscript {
 
 RsdCpuScriptIntrinsic::RsdCpuScriptIntrinsic(RsdCpuReferenceImpl *ctx, const Script *s,
                                              const Element *e, RsScriptIntrinsicID iid)
@@ -119,3 +119,6 @@
     mtls->kernel = mRootPtr;
     mtls->fep.usr = this;
 }
+
+} // namespace renderscript
+} // namespace android