From 660b4f01aa95e889db069a46d58f61a13f7943a1 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Sat, 19 Jun 2010 04:44:03 +0200
Subject: [PATCH] In "utilities.h", only include those headers that are needed
 by the definitions in "utilities.h".

---
 src/filelister.cpp | 1 +
 src/menu.cpp       | 1 +
 src/selector.cpp   | 1 +
 src/translator.cpp | 1 +
 src/utilities.cpp  | 4 ++++
 src/utilities.h    | 3 ---
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/filelister.cpp b/src/filelister.cpp
index ea4627a..0779840 100644
--- a/src/filelister.cpp
+++ b/src/filelister.cpp
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
 
 #include "filelister.h"
 #include "utilities.h"
diff --git a/src/menu.cpp b/src/menu.cpp
index 7ae3974..78a1c3a 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -24,6 +24,7 @@
 #include <dirent.h>
 #include <algorithm>
 #include <math.h>
+#include <fstream>
 
 #include "gmenu2x.h"
 #include "linkapp.h"
diff --git a/src/selector.cpp b/src/selector.cpp
index fc09194..bd8db62 100644
--- a/src/selector.cpp
+++ b/src/selector.cpp
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <fstream>
 
 #include "menu.h"
 #include "linkapp.h"
diff --git a/src/translator.cpp b/src/translator.cpp
index 3808050..2b9de96 100644
--- a/src/translator.cpp
+++ b/src/translator.cpp
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <fstream>
 #include <iostream>
 #include <sstream>
 #include <stdarg.h>
diff --git a/src/utilities.cpp b/src/utilities.cpp
index 7d9bd88..88f3bf9 100644
--- a/src/utilities.cpp
+++ b/src/utilities.cpp
@@ -22,7 +22,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <fstream>
 #include <iostream>
+#include <strings.h>
+
+#include <SDL.h>
 
 #include "utilities.h"
 
diff --git a/src/utilities.h b/src/utilities.h
index 006801d..188ad1e 100644
--- a/src/utilities.h
+++ b/src/utilities.h
@@ -21,9 +21,6 @@
 #ifndef UTILITIES_H
 #define UTILITIES_H
 
-#include <SDL.h>
-#include <SDL_gfxPrimitives.h>
-#include <fstream>
 #include <string>
 #include <vector>
 #include <tr1/unordered_map>