1 files changed, 5 insertions, 2 deletions
diff --git a/remoting/base/compound_buffer.h b/remoting/base/compound_buffer.h
index 50d3efb..4883e11 100644
--- a/remoting/base/compound_buffer.h
+++ b/remoting/base/compound_buffer.h
@@ -18,9 +18,12 @@
 #ifndef REMOTING_BASE_COMPOUND_BUFFER_H_
 #define REMOTING_BASE_COMPOUND_BUFFER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <deque>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 
@@ -111,7 +114,7 @@ class CompoundBufferInputStream
   bool Next(const void** data, int* size) override;
   void BackUp(int count) override;
   bool Skip(int count) override;
-  int64 ByteCount() const override;
+  int64_t ByteCount() const override;
 
  private:
   const CompoundBuffer* buffer_;