diff --git a/src/googletest.h b/src/googletest.h
index d2d65ff..abc825b 100644
--- a/src/googletest.h
+++ b/src/googletest.h
@@ -46,6 +46,9 @@
 #include <string>
 #include <vector>
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc
index cf79d53..0c32823 100644
--- a/src/logging_unittest.cc
+++ b/src/logging_unittest.cc
@@ -48,6 +48,9 @@
 #include <string>
 #include <vector>
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "base/commandlineflags.h"
 #include "glog/logging.h"
 #include "glog/raw_logging.h"
diff --git a/src/symbolize.cc b/src/symbolize.cc
index 7d3bfc1..0e72f87 100644
--- a/src/symbolize.cc
+++ b/src/symbolize.cc
@@ -441,8 +441,7 @@ class LineReader {
   void operator=(const LineReader&);
 
   char *FindLineFeed() {
-    return reinterpret_cast<char *>
-      (memchr(reinterpret_cast<const void *>(bol_), '\n', eod_ - bol_));
+    return reinterpret_cast<char *>(memchr(bol_, '\n', eod_ - bol_));
   }
 
   bool BufferIsEmpty() {
@@ -456,7 +455,7 @@ class LineReader {
   const int fd_;
   char * const buf_;
   const int buf_len_;
-  const char *bol_;
+  char *bol_;
   char *eol_;
   const char *eod_;  // End of data in "buf_".
 };
diff --git a/src/utilities.cc b/src/utilities.cc
index 868ca13..5a0322c 100644
--- a/src/utilities.cc
+++ b/src/utilities.cc
@@ -31,6 +31,9 @@
 
 #include "utilities.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <signal.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>