diff --git a/atom/common/api/atom_api_crash_reporter.cc b/atom/common/api/atom_api_crash_reporter.cc
index e396356cdbb8..4b51a88b9f3d 100644
--- a/atom/common/api/atom_api_crash_reporter.cc
+++ b/atom/common/api/atom_api_crash_reporter.cc
@@ -11,6 +11,8 @@
 
 #include "atom/common/node_includes.h"
 
+using crash_reporter::CrashReporter;
+
 namespace mate {
 
 template<>
@@ -32,10 +34,9 @@ struct Converter<std::map<std::string, std::string> > {
 };
 
 template<>
-struct Converter<std::vector<crash_reporter::CrashReporter::UploadReportResult> > {
+struct Converter<std::vector<CrashReporter::UploadReportResult> > {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-      const std::vector<
-          crash_reporter::CrashReporter::UploadReportResult>& reports) {
+      const std::vector<CrashReporter::UploadReportResult>& reports) {
     v8::Local<v8::Array> result(v8::Array::New(isolate, reports.size()));
     for (size_t i = 0; i < reports.size(); ++i) {
       mate::Dictionary dict(isolate, v8::Object::New(isolate));
@@ -54,14 +55,12 @@ struct Converter<std::vector<crash_reporter::CrashReporter::UploadReportResult>
 
 namespace {
 
-std::vector<crash_reporter::CrashReporter::UploadReportResult>
-GetUploadedReports() {
-  return (crash_reporter::CrashReporter::GetInstance())->GetUploadedReports();
+std::vector<CrashReporter::UploadReportResult> GetUploadedReports() {
+  return (CrashReporter::GetInstance())->GetUploadedReports();
 }
 
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
-  using crash_reporter::CrashReporter;
   mate::Dictionary dict(context->GetIsolate(), exports);
   dict.SetMethod("start",
                  base::Bind(&CrashReporter::Start,
diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc
index 5d1e2146cc86..25dbf6065d96 100644
--- a/atom/common/crash_reporter/crash_reporter.cc
+++ b/atom/common/crash_reporter/crash_reporter.cc
@@ -39,7 +39,8 @@ void CrashReporter::SetUploadParameters(const StringMap& parameters) {
   SetUploadParameters();
 }
 
-std::vector<CrashReporter::UploadReportResult> CrashReporter::GetUploadedReports() {
+std::vector<CrashReporter::UploadReportResult>
+CrashReporter::GetUploadedReports() {
   return std::vector<CrashReporter::UploadReportResult>();
 }
 
diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h
index c81111b596bd..6cfa5b3f3a59 100644
--- a/atom/common/crash_reporter/crash_reporter.h
+++ b/atom/common/crash_reporter/crash_reporter.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -16,7 +17,7 @@ namespace crash_reporter {
 class CrashReporter {
  public:
   typedef std::map<std::string, std::string> StringMap;
-  typedef std::pair<int, std::string> UploadReportResult; // upload-date, id
+  typedef std::pair<int, std::string> UploadReportResult;  // upload-date, id
 
   static CrashReporter* GetInstance();
 
diff --git a/atom/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h
index 25eb0e28ba95..ca31237cc154 100644
--- a/atom/common/crash_reporter/crash_reporter_mac.h
+++ b/atom/common/crash_reporter/crash_reporter_mac.h
@@ -6,6 +6,7 @@
 #define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
 
 #include <string>
+#include <vector>
 
 #include "atom/common/crash_reporter/crash_reporter.h"
 #include "base/compiler_specific.h"