diff --git a/src/dawn_wire/server/Server.h b/src/dawn_wire/server/Server.h
index 7b673d8..d503e81 100644
--- a/src/dawn_wire/server/Server.h
+++ b/src/dawn_wire/server/Server.h
@@ -53,8 +53,6 @@
         Server* const server;
         std::weak_ptr<bool> const serverIsAlive;
 
-      private:
-        friend class Server;
         CallbackUserdata() = delete;
         CallbackUserdata(Server* server, const std::shared_ptr<bool>& serverIsAlive)
             : server(server), serverIsAlive(serverIsAlive) {
diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp
index 0327565..973a923 100644
--- a/src/tests/end2end/ColorStateTests.cpp
+++ b/src/tests/end2end/ColorStateTests.cpp
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <algorithm>
 #include <array>
 #include <cmath>