Merge branch 'alpm.c_cleanup' into frontend_config

Conflicts:

	lib/libalpm/alpm.c

1 files changed, 0 insertions, 1 deletions

diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index ed2e9207..b936c6b8 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -32,7 +32,6 @@
 #endif
 #include <sys/stat.h>
 #include <dirent.h>
-#include <locale.h>
 #ifdef CYGWIN
 #include <limits.h> /* PATH_MAX */
 #endif