diff --git a/mock_payload_state.h b/mock_payload_state.h
index 728f274..2f654c7 100644
--- a/mock_payload_state.h
+++ b/mock_payload_state.h
@@ -74,6 +74,7 @@
   MOCK_CONST_METHOD0(GetUsingP2PForSharing, bool());
   MOCK_METHOD0(GetScatteringWaitPeriod, base::TimeDelta());
   MOCK_CONST_METHOD0(GetP2PUrl, std::string());
+  MOCK_CONST_METHOD0(GetAttemptErrorCode, ErrorCode());
 };
 
 }  // namespace chromeos_update_engine
diff --git a/update_engine.gyp b/update_engine.gyp
index 7da34fb..b7aaa9d 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -333,8 +333,8 @@
         'libupdate_engine_client',
       ],
       'sources': [
-        'update_engine_client.cc',
         'common/error_code_utils.cc',
+        'update_engine_client.cc',
      ],
     },
     # server-side code. This is used for delta_generator and unittests but not