In "utilities.h", only include those headers that are needed by the definitions in "utilities.h".

src/filelister.cpp

@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
 
 #include "filelister.h"
 #include "utilities.h"

src/menu.cpp

@@ -24,6 +24,7 @@
 #include <dirent.h>
 #include <algorithm>
 #include <math.h>
+#include <fstream>
 
 #include "gmenu2x.h"
 #include "linkapp.h"

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"

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>

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"
 

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>