diff options
| -rw-r--r-- | miscutils/hdparm.c | 3 | ||||
| -rw-r--r-- | networking/udhcp/clientpacket.c | 9 | ||||
| -rw-r--r-- | networking/udhcp/clientsocket.c | 8 | ||||
| -rw-r--r-- | util-linux/mkfs_vfat.c | 3 |
4 files changed, 12 insertions, 11 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 362b212a3..60682231a 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
| @@ -11,9 +11,10 @@ | |||
| 11 | * hdparm.c - Command line interface to get/set hard disk parameters | 11 | * hdparm.c - Command line interface to get/set hard disk parameters |
| 12 | * - by Mark Lord (C) 1994-2002 -- freely distributable | 12 | * - by Mark Lord (C) 1994-2002 -- freely distributable |
| 13 | */ | 13 | */ |
| 14 | #include "libbb.h" | ||
| 15 | /* must be _after_ libbb.h: */ | ||
| 14 | #include <linux/hdreg.h> | 16 | #include <linux/hdreg.h> |
| 15 | #include <sys/mount.h> | 17 | #include <sys/mount.h> |
| 16 | #include "libbb.h" | ||
| 17 | 18 | ||
| 18 | /* device types */ | 19 | /* device types */ |
| 19 | /* ------------ */ | 20 | /* ------------ */ |
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index 0a3e6441b..8ccdfcca2 100644 --- a/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c | |||
| @@ -7,6 +7,10 @@ | |||
| 7 | * | 7 | * |
| 8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 9 | */ | 9 | */ |
| 10 | #include "common.h" | ||
| 11 | #include "dhcpd.h" | ||
| 12 | #include "dhcpc.h" | ||
| 13 | #include "options.h" | ||
| 10 | 14 | ||
| 11 | //#include <features.h> | 15 | //#include <features.h> |
| 12 | #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION | 16 | #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION |
| @@ -18,11 +22,6 @@ | |||
| 18 | #include <linux/if_ether.h> | 22 | #include <linux/if_ether.h> |
| 19 | #endif | 23 | #endif |
| 20 | 24 | ||
| 21 | #include "common.h" | ||
| 22 | #include "dhcpd.h" | ||
| 23 | #include "dhcpc.h" | ||
| 24 | #include "options.h" | ||
| 25 | |||
| 26 | 25 | ||
| 27 | /* Create a random xid */ | 26 | /* Create a random xid */ |
| 28 | uint32_t FAST_FUNC random_xid(void) | 27 | uint32_t FAST_FUNC random_xid(void) |
diff --git a/networking/udhcp/clientsocket.c b/networking/udhcp/clientsocket.c index 0febc0459..8e68f31e7 100644 --- a/networking/udhcp/clientsocket.c +++ b/networking/udhcp/clientsocket.c | |||
| @@ -20,6 +20,10 @@ | |||
| 20 | * along with this program; if not, write to the Free Software | 20 | * along with this program; if not, write to the Free Software |
| 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | #include "common.h" | ||
| 24 | #include "dhcpd.h" | ||
| 25 | #include "dhcpc.h" | ||
| 26 | |||
| 23 | 27 | ||
| 24 | //#include <features.h> | 28 | //#include <features.h> |
| 25 | #include <asm/types.h> | 29 | #include <asm/types.h> |
| @@ -32,10 +36,6 @@ | |||
| 32 | #endif | 36 | #endif |
| 33 | #include <linux/filter.h> | 37 | #include <linux/filter.h> |
| 34 | 38 | ||
| 35 | #include "common.h" | ||
| 36 | #include "dhcpd.h" | ||
| 37 | #include "dhcpc.h" | ||
| 38 | |||
| 39 | int FAST_FUNC udhcp_raw_socket(int ifindex) | 39 | int FAST_FUNC udhcp_raw_socket(int ifindex) |
| 40 | { | 40 | { |
| 41 | int fd; | 41 | int fd; |
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index 8d12babdc..dff10f9e1 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | * | 7 | * |
| 8 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2, see file LICENSE in this tarball for details. |
| 9 | */ | 9 | */ |
| 10 | #include "libbb.h" | ||
| 11 | |||
| 10 | #include <linux/hdreg.h> /* HDIO_GETGEO */ | 12 | #include <linux/hdreg.h> /* HDIO_GETGEO */ |
| 11 | #include <linux/fd.h> /* FDGETPRM */ | 13 | #include <linux/fd.h> /* FDGETPRM */ |
| 12 | #include <sys/mount.h> /* BLKSSZGET */ | 14 | #include <sys/mount.h> /* BLKSSZGET */ |
| @@ -14,7 +16,6 @@ | |||
| 14 | # define BLKSSZGET _IO(0x12, 104) | 16 | # define BLKSSZGET _IO(0x12, 104) |
| 15 | #endif | 17 | #endif |
| 16 | //#include <linux/msdos_fs.h> | 18 | //#include <linux/msdos_fs.h> |
| 17 | #include "libbb.h" | ||
| 18 | #include "volume_id/volume_id_internal.h" | 19 | #include "volume_id/volume_id_internal.h" |
| 19 | 20 | ||
| 20 | #define SECTOR_SIZE 512 | 21 | #define SECTOR_SIZE 512 |