diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index d3a1188..d2bc40d 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -533,7 +533,7 @@
                 item->setCString(kAudioPolicyRqstPkg,
                                  std::string(String8(client->opPackageName).string()).c_str());
             } else {
-                item->setCString(kAudioPolicyRqstPkg, to_string(client->uid).c_str());
+                item->setCString(kAudioPolicyRqstPkg, std::to_string(client->uid).c_str());
             }
             item->setCString(
                     kAudioPolicyRqstDevice, getDeviceTypeStrForPortId(client->deviceId).c_str());
@@ -558,7 +558,8 @@
                             item->setCString(kAudioPolicyActivePkg,
                                  std::string(String8(other->opPackageName).string()).c_str());
                         } else {
-                            item->setCString(kAudioPolicyRqstPkg, to_string(other->uid).c_str());
+                            item->setCString(kAudioPolicyRqstPkg,
+                                             std::to_string(other->uid).c_str());
                         }
                         item->setCString(kAudioPolicyActiveDevice,
                                          getDeviceTypeStrForPortId(other->deviceId).c_str());
diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index 02019a2..09375f1 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -38,8 +38,6 @@
 
 namespace android {
 
-using namespace std;
-
 // ----------------------------------------------------------------------------
 
 class AudioPolicyService :