diff --git a/http_common.cc b/http_common.cc
index bf4e69d..c230620 100644
--- a/http_common.cc
+++ b/http_common.cc
@@ -4,10 +4,11 @@
 
 // Implementation of common HTTP related functions.
 
-#include "base/basictypes.h"
-
 #include "update_engine/http_common.h"
 
+#include "base/basictypes.h"
+
+namespace chromeos_update_engine {
 
 const char *GetHttpResponseDescription(HttpResponseCode code) {
   static const struct {
@@ -69,3 +70,5 @@
 
   return (is_found ? http_content_type_table[i].str : NULL);
 }
+
+} //  namespace chromeos_update_engine
diff --git a/http_common.h b/http_common.h
index 2c52445..51e9e7a 100644
--- a/http_common.h
+++ b/http_common.h
@@ -8,7 +8,9 @@
 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_COMMON_H_
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_COMMON_H_
 
-#include <stdlib.h>
+#include <cstdlib>
+
+namespace chromeos_update_engine {
 
 // Enumeration type for HTTP response codes.
 enum HttpResponseCode {
@@ -55,4 +57,6 @@
 // Returns a standard HTTP Content-Type string.
 const char *GetHttpContentTypeString(HttpContentType type);
 
+}  // namespace chromeos_update_engine
+
 #endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_HTTP_COMMON_H_