include and ifdef clean-up

src/helpers.cpp

@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <algorithm>
 #include <iostream>
 
 #include "helpers.h"

src/ncmpcpp.cpp

@@ -18,7 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <clocale>
+
+#include <algorithm>
 #include <iostream>
+#include <map>
 
 #include "mpdpp.h"
 #include "ncmpcpp.h"

src/ncmpcpp.h

@@ -21,22 +21,6 @@
 #ifndef HAVE_NCMPCPP_H
 #define HAVE_NCMPCPP_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef UTF8_ENABLED
-# define UNICODE 1
-#else
-# define UNICODE 0
-#endif
-
-#include <cstdio>
-#include <clocale>
-#include <ctime>
-#include <algorithm>
-#include <map>
-
 #include "window.h"
 #include "menu.h"
 #include "scrollpad.h"

src/window.h

@@ -21,6 +21,10 @@
 #ifndef HAVE_WINDOW_H
 #define HAVE_WINDOW_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ncurses.h"
 
 #include <stack>
@@ -30,10 +34,12 @@
 #include <cstring>
 
 #ifdef UTF8_ENABLED
+# define UNICODE 1
 # define my_string_t wstring
 # define TO_STRING(x) ToString(x)
 # define TO_WSTRING(x) ToWString(x)
 #else
+# define UNICODE 0
 # define my_string_t string
 # define TO_STRING(x) x
 # define TO_WSTRING(x) x