Merge pull request #318 from jsternberg/master

Missing/unused header files

5 files changed, 20 insertions, 1 deletions

diff --git a/src/build.cc b/src/build.cc
index 157442d..a15f874 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -16,6 +16,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -23,7 +24,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <sys/termios.h>
 #endif
 
 #include "build_log.h"
diff --git a/src/depfile_parser.h b/src/depfile_parser.h
index c900956..1e6ebb5 100644
--- a/src/depfile_parser.h
+++ b/src/depfile_parser.h
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef NINJA_DEPFILE_PARSER_H_
+#define NINJA_DEPFILE_PARSER_H_
+
 #include <string>
 #include <vector>
 using namespace std;
@@ -28,3 +31,5 @@ struct DepfileParser {
   StringPiece out_;
   vector<StringPiece> ins_;
 };
+
+#endif // NINJA_DEPFILE_PARSER_H_
diff --git a/src/explain.h b/src/explain.h
index 021f0d4..d4f6a6c 100644
--- a/src/explain.h
+++ b/src/explain.h
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef NINJA_EXPLAIN_H_
+#define NINJA_EXPLAIN_H_
+
 #include <stdio.h>
 
 #define EXPLAIN(fmt, ...) {                                             \
@@ -20,3 +23,5 @@
 }
 
 extern bool g_explaining;
+
+#endif // NINJA_EXPLAIN_H_
diff --git a/src/lexer.h b/src/lexer.h
index 75c1b2f..19008d7 100644
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef NINJA_LEXER_H_
+#define NINJA_LEXER_H_
+
 #include "string_piece.h"
 
 // Windows may #define ERROR.
@@ -95,3 +98,4 @@ private:
   const char* last_token_;
 };
 
+#endif // NINJA_LEXER_H_
diff --git a/src/metrics.h b/src/metrics.h
index 74f5f8f..af6e9a2 100644
--- a/src/metrics.h
+++ b/src/metrics.h
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef NINJA_METRICS_H_
+#define NINJA_METRICS_H_
+
 #include <string>
 #include <vector>
 using namespace std;
@@ -62,3 +65,5 @@ private:
   ScopedMetric metrics_h_scoped(metrics_h_metric);
 
 extern Metrics* g_metrics;
+
+#endif // NINJA_METRICS_H_