Cleanup headers.

Eliminate unused & unix specific headers.

diff --git a/cli/apitrace.cpp b/cli/apitrace.cpp
index 107952cf5529165ce8211df11d2fffaa55ff50c8..dde2c59f733f4da0290411a58fa52db3d4a148d1 100644 (file)
--- a/cli/apitrace.cpp
+++ b/cli/apitrace.cpp
@@ -31,6 +31,11 @@
  * functionality.
  */
 
+#include <string.h>
+
+#include <iomanip>
+#include <iostream>
+
 #include "apitrace_cli.hpp"
 
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))

diff --git a/cli/apitrace_cli.hpp b/cli/apitrace_cli.hpp
index 7394bb9632a23320feb917e0d754842053de4bab..8e43277422f1a8883897ec3680288f2844411ad2 100644 (file)
--- a/cli/apitrace_cli.hpp
+++ b/cli/apitrace_cli.hpp
@@ -28,14 +28,6 @@
 #ifndef _APITRACE_CLI_HPP_
 #define _APITRACE_CLI_HPP_
 
-#include <iostream>
-#include <iomanip>
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #define APITRACE_DUMP_SYNOPSIS "Dump given trace(s) to standard output."
 
 void

diff --git a/cli/apitrace_dump.cpp b/cli/apitrace_dump.cpp
index 41900cf18dfb8f8041894a72dd62968905455e59..540a21c7d17ec1001b705c8c995de3920541eaa9 100644 (file)
--- a/cli/apitrace_dump.cpp
+++ b/cli/apitrace_dump.cpp
@@ -23,6 +23,8 @@
  *
  **************************************************************************/
 
+#include <string.h>
+
 #include "apitrace_cli.hpp"
 
 #include "trace_parser.hpp"