lsfd: include common headers in lsfd.h

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

diff --git a/misc-utils/lsfd-bdev.c b/misc-utils/lsfd-bdev.c
index 7be99dbde41cffd2756d3b9ea6ef023c836dc0d4..b61fdbbf4c5882375eae8cd4352342ced97190d3 100644 (file)
--- a/misc-utils/lsfd-bdev.c
+++ b/misc-utils/lsfd-bdev.c
@@ -19,10 +19,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 
 static struct list_head partitions;

diff --git a/misc-utils/lsfd-cdev.c b/misc-utils/lsfd-cdev.c
index 5f0f306500b7463f88761ac2ebbf009894a03ade..70751bab970070b98699195870f0cde570aa5940 100644 (file)
--- a/misc-utils/lsfd-cdev.c
+++ b/misc-utils/lsfd-cdev.c
@@ -19,10 +19,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 
 static struct list_head miscdevs;

diff --git a/misc-utils/lsfd-fifo.c b/misc-utils/lsfd-fifo.c
index 6880d8dd47c2177b599dcd8c91f39f924f22adad..b78e6d4875cb85170bebc6df8a4dccb07a568093 100644 (file)
--- a/misc-utils/lsfd-fifo.c
+++ b/misc-utils/lsfd-fifo.c
@@ -19,10 +19,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 
 struct fifo {

diff --git a/misc-utils/lsfd-file.c b/misc-utils/lsfd-file.c
index 004dd665e244cc8a8fae11496caa4a622cc0f795..186ce62e5e3541dc724b747e23d69a21e80a514f 100644 (file)
--- a/misc-utils/lsfd-file.c
+++ b/misc-utils/lsfd-file.c
@@ -34,14 +34,11 @@
 #include <linux/sched.h>
 #include <sys/shm.h>
 
-#include "xalloc.h"
-#include "nls.h"
 #include "buffer.h"
 #include "idcache.h"
 #include "strutils.h"
 
 #include "procfs.h"
-#include "libsmartcols.h"
 
 #include "lsfd.h"
 

diff --git a/misc-utils/lsfd-sock-xinfo.c b/misc-utils/lsfd-sock-xinfo.c
index f4febc11dbd0cb5ebddb25df8015ecb3959dfd05..12770ef9678fded86e661ab0f04cc6321dd44c01 100644 (file)
--- a/misc-utils/lsfd-sock-xinfo.c
+++ b/misc-utils/lsfd-sock-xinfo.c
@@ -34,9 +34,6 @@
 #include <string.h>
 #include <sys/socket.h>                /* SOCK_* */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
 #include "sysfs.h"
 #include "bitops.h"
 

diff --git a/misc-utils/lsfd-sock.c b/misc-utils/lsfd-sock.c
index 32645169c8d159f09a865d77f3edc4d9fca80bac..5ed133e65238a904be7a61f351a8922dfeee9398 100644 (file)
--- a/misc-utils/lsfd-sock.c
+++ b/misc-utils/lsfd-sock.c
@@ -22,10 +22,6 @@
 #include <sys/types.h>
 #include <sys/xattr.h>
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 #include "lsfd-sock.h"
 

diff --git a/misc-utils/lsfd-unkn.c b/misc-utils/lsfd-unkn.c
index 8a494122ca25182e359c73e333f33fe65147d4de..acf29775dbe7aad661b64972d10f03cf7fac0996 100644 (file)
--- a/misc-utils/lsfd-unkn.c
+++ b/misc-utils/lsfd-unkn.c
@@ -22,10 +22,6 @@
 #include <sys/timerfd.h>
 #include <time.h>
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "signames.h"
 #include "timeutils.h"
 

diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index bc7f901d481bda88c8de814c17befcaf32c927dc..0174e2768276293d3127171bbc98a6cc5b21e0e6 100644 (file)
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -46,8 +46,6 @@ static int kcmp(pid_t pid1, pid_t pid2, int type,
 #define PF_KTHREAD             0x00200000      /* I am a kernel thread */
 
 #include "c.h"
-#include "nls.h"
-#include "xalloc.h"
 #include "list.h"
 #include "closestream.h"
 #include "strutils.h"
@@ -56,8 +54,6 @@ static int kcmp(pid_t pid1, pid_t pid2, int type,
 #include "idcache.h"
 #include "pathnames.h"
 
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 #include "lsfd-filter.h"
 #include "lsfd-counter.h"

diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index be4cc55d80872dd9faf6c6e16d831e92270ec27e..33467414dca5d6a2f07ddd5d7e95178526602df3 100644 (file)
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -29,9 +29,12 @@
 #include <dirent.h>
 #include <inttypes.h>
 
+#include "libsmartcols.h"
 #include "list.h"
+#include "nls.h"
 #include "path.h"
 #include "strutils.h"
+#include "xalloc.h"
 
 /*
  * column IDs