diff --git a/hphp/runtime/ext/JSON_parser.cpp b/hphp/runtime/ext/JSON_parser.cpp
index 0a83fdc6a..845735cc4 100644
--- a/hphp/runtime/ext/JSON_parser.cpp
+++ b/hphp/runtime/ext/JSON_parser.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 #define MAX_LENGTH_OF_LONG 20
 static const char long_min_digits[] = "9223372036854775808";
 
-using namespace HPHP;
+namespace HPHP {
 
 #ifdef true
 # undef true
@@ -865,3 +865,5 @@ bool JSON_parser(Variant &z, const char *p, int length, bool assoc/*<fb>*/,
   s_json_parser->error_code = JSON_ERROR_SYNTAX;
   return false;
 }
+
+}
diff --git a/hphp/runtime/ext/JSON_parser.h b/hphp/runtime/ext/JSON_parser.h
index a0d850059..73d954bf5 100644
--- a/hphp/runtime/ext/JSON_parser.h
+++ b/hphp/runtime/ext/JSON_parser.h
@@ -21,6 +21,8 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/string_buffer.h"
 
+namespace HPHP {
+
 void utf16_to_utf8(HPHP::StringBuffer &buf, unsigned short utf16);
 bool JSON_parser(HPHP::Variant &z, const char *p, int length,
                  bool assoc/*<fb>*/, bool loose/*</fb>*/);
@@ -38,4 +40,6 @@ json_error_codes json_get_last_error_code();
 const char *json_get_last_error_msg();
 void json_set_last_error_code(json_error_codes ec);
 
+}
+
 #endif // incl_HPHP_JSON_PARSER_H_