include cleanup.

diff --git a/src/init.C b/src/init.C
index e10f0bf15d233b6ecf94dbee20c92608bd097602..2cf02209bd533eb32591a52711e5ed1bc5f139c3 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -43,6 +43,19 @@
 
 #include <csignal>
 
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+
+#ifdef HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
+
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>

diff --git a/src/init.h b/src/init.h
index 9f8f89261948be40c374f1b5c26dc616ff6298a8..2e54e8d48ad677e84aa821a91507171de1968ab7 100644 (file)
--- a/src/init.h
+++ b/src/init.h
@@ -4,19 +4,6 @@
 #undef CERASE /* TODO */
 #define CERASE '\010'  /* ^H */
 
-#ifdef HAVE_XSETLOCALE
-# define X_LOCALE
-# include <X11/Xlocale.h>
-#else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
-#endif
-
-#ifdef TTY_GID_SUPPORT
-# include <grp.h>
-#endif
-
 /* ways to deal with getting/setting termios structure */
 
 /* termios interface */

diff --git a/src/main.C b/src/main.C
index 906965920a77fc5f351a75667fcdea2646140ce3..22df33d2df188280f66b60485b75d98c861c5216 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -40,14 +40,19 @@
 #include <csignal>
 #include <cstring>
 
-#ifdef TTY_GID_SUPPORT
-# include <grp.h>
-#endif
-
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
 #endif
 
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+
 vector<rxvt_term *> rxvt_term::termlist;
 
 // used to tell global functions which terminal instance is "active"

diff --git a/src/rxvtfont.h b/src/rxvtfont.h
index 7d845f4b8e14cadd1a5649343d77a2ad24d08c7a..86281664eeaa2c50ac55f9007dcf8a4c7780bb43 100644 (file)
--- a/src/rxvtfont.h
+++ b/src/rxvtfont.h
@@ -6,19 +6,6 @@
 # include <X11/Xft/Xft.h>
 #endif
 
-#ifdef HAVE_XSETLOCALE
-# define X_LOCALE
-# include <X11/Xlocale.h>
-#else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
-#endif
-
-#ifdef HAVE_NL_LANGINFO
-# include <langinfo.h>
-#endif
-
 #include <inttypes.h>
 
 #include "feature.h"