9 files changed, 15 insertions, 69 deletions

diff --git a/procps/free.c b/procps/free.c
index b4163f108..7d8ffa893 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -4,28 +4,15 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 /* getopt not needed */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include "busybox.h"
 
 int free_main(int argc, char **argv)
 {
diff --git a/procps/fuser.c b/procps/fuser.c
index 35d77ed1c..1a4f612f1 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * tiny fuser implementation
  *
@@ -7,6 +8,7 @@
  * GNU Library General Public License
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -19,7 +21,6 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/sysmacros.h>
-#include "busybox.h"
 
 #define FUSER_PROC_DIR "/proc"
 #define FUSER_MAX_LINE 255
diff --git a/procps/kill.c b/procps/kill.c
index 90114a493..ca6f4203a 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -5,23 +5,10 @@
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -30,7 +17,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
-#include "busybox.h"
 
 #define KILL 0
 #define KILLALL 1
diff --git a/procps/pidof.c b/procps/pidof.c
index 4ad6b1567..d9c8dca42 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -7,7 +7,7 @@
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
 
-
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "busybox.h"
 
 #if ENABLE_FEATURE_PIDOF_SINGLE
 #define _SINGLE_COMPL(a) a
diff --git a/procps/ps.c b/procps/ps.c
index b6242d208..9dc68395a 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -7,6 +7,7 @@
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -17,7 +18,6 @@
 #include <string.h>
 #include <termios.h>
 #include <sys/ioctl.h>
-#include "busybox.h"
 #if ENABLE_SELINUX
 #include <selinux/selinux.h>  /* for is_selinux_enabled()  */
 #endif
diff --git a/procps/renice.c b/procps/renice.c
index 711ed164e..53dc57855 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 /* Notes:
@@ -32,6 +19,7 @@
  *   following IDs (if any).  Multiple switches are allowed.
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,7 +27,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/resource.h>
-#include "busybox.h"
 
 #if (PRIO_PROCESS < CHAR_MIN) || (PRIO_PROCESS > CHAR_MAX)
 #error Assumption violated : PRIO_PROCESS value
diff --git a/procps/sysctl.c b/procps/sysctl.c
index 125f13207..5673d293f 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -1,4 +1,4 @@
-
+/* vi: set sw=4 ts=4: */
 /*
  * Sysctl 1.01 - A utility to read and manipulate the sysctl parameters
  *
@@ -14,6 +14,7 @@
  *
  */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -23,7 +24,6 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "busybox.h"
 
 /*
  *    Function Prototypes
diff --git a/procps/top.c b/procps/top.c
index c0d16b658..a97e557aa 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -28,13 +28,13 @@
  * GNU Library General Public License
  */
 
+#include "busybox.h"
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#include "busybox.h"
 
 //#define CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE  /* + 2k */
 
diff --git a/procps/uptime.c b/procps/uptime.c
index 7784850ae..c1e7af3a5 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 /* This version of uptime doesn't display the number of users on the system,
@@ -28,12 +15,11 @@
 
 /* getopt not needed */
 
-
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
 #include <stdlib.h>
-#include "busybox.h"
 
 #ifndef FSHIFT
 # define FSHIFT 16              /* nr of bits of precision */