remove the include duplicates from source files

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

lib/strutil/replace.c

@@ -25,8 +25,9 @@
 
 #include <config.h>
 
-#include "lib/strutil.h"
+#include "lib/global.h"
 #include "lib/strescape.h"
+#include "lib/strutil.h"
 
 /*** global variables ****************************************************************************/
 

lib/strutil/strescape.c

@@ -1,7 +1,7 @@
 /*
    Functions for escaping and unescaping strings
 
-   Copyright (C) 2009, 2011
+   Copyright (C) 2009, 2011, 2013
    The Free Software Foundation, Inc.
 
    Written by:
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "lib/global.h"
 #include "lib/strescape.h"
 
 /*** global variables ****************************************************************************/

lib/strutil/strutil.c

@@ -1,7 +1,7 @@
 /*
    Common strings utilities
 
-   Copyright (C) 2007, 2011
+   Copyright (C) 2007, 2011, 2013
    The Free Software Foundation, Inc.
 
    Written by:
@@ -21,16 +21,14 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
  */
 
 #include <config.h>
+
 #include <stdlib.h>
-#include <stdio.h>
 #include <langinfo.h>
 #include <string.h>
 #include <errno.h>
-#include <stdarg.h>
 
 #include "lib/global.h"
 #include "lib/strutil.h"

lib/strutil/strutil8bit.c

@@ -1,7 +1,7 @@
 /*
    8bit strings utilities
 
-   Copyright (C) 2007, 2011
+   Copyright (C) 2007, 2011, 2013
    The Free Software Foundation, Inc.
 
    Written by:
@@ -24,9 +24,9 @@
  */
 
 #include <config.h>
-#include <stdio.h>
+
 #include <ctype.h>
-#include <errno.h>
+#include <stdlib.h>
 
 #include "lib/global.h"
 #include "lib/strutil.h"

lib/strutil/strutilascii.c

@@ -1,7 +1,7 @@
 /*
    ASCII strings utilities
 
-   Copyright (C) 2007, 2011
+   Copyright (C) 2007, 2011, 2013
    The Free Software Foundation, Inc.
 
    Written by:
@@ -22,12 +22,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <config.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include <config.h>
-#include <errno.h>
+#include <stdlib.h>
+
 #include "lib/global.h"
 #include "lib/strutil.h"
 

lib/strutil/strutilutf8.c

@@ -1,7 +1,7 @@
 /*
    UTF-8 strings utilities
 
-   Copyright (C) 2007, 2011
+   Copyright (C) 2007, 2011, 2013
    The Free Software Foundation, Inc.
 
    Written by:
@@ -24,10 +24,8 @@
  */
 
 #include <config.h>
+
 #include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <glib.h>
 #include <langinfo.h>
 #include <string.h>
 

lib/tty/tty-ncurses.h

@@ -5,13 +5,9 @@
 #ifdef USE_NCURSES
 #ifdef HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
-#elif HAVE_NCURSES_NCURSES_H
+#elif HAVE_NCURSES_NCURSES_H || HAVE_NCURSESW_CURSES_H
 #include <ncurses/ncurses.h>
-#elif HAVE_NCURSESW_CURSES_H
-#include <ncursesw/curses.h>
-#elif HAVE_NCURSES_HCURSES_H
-#include <ncurses.h>
-#elif HAVE_NCURSES_H
+#elif HAVE_NCURSES_HCURSES_H || HAVE_NCURSES_H
 #include <ncurses.h>
 #else
 #include <curses.h>

src/filemanager/filegui.c

@@ -108,7 +108,6 @@ statvfs_works (void)
     return 1;
 }
 #else
-#include <string.h>             /* for strverscmp */
 #include <sys/utsname.h>
 #include <sys/statfs.h>
 #define STAT_STATFS2_BSIZE 1

src/filemanager/panelize.c

@@ -55,7 +55,6 @@
 #include "panel.h"              /* WPanel */
 
 #include "panelize.h"
-#include "panel.h"
 
 /*** global variables ****************************************************************************/
 

src/help.c

@@ -66,7 +66,6 @@
 #include "lib/widget.h"
 #include "lib/event-types.h"
 
-#include "keybind-defaults.h"
 #include "keybind-defaults.h"
 #include "help.h"
 

src/vfs/extfs/extfs.c

@@ -50,7 +50,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 #include "lib/global.h"
 #include "lib/fileloc.h"