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 @@
  * hdparm.c - Command line interface to get/set hard disk parameters
  *          - by Mark Lord (C) 1994-2002 -- freely distributable
  */
+#include "libbb.h"
+/* must be _after_ libbb.h: */
 #include <linux/hdreg.h>
 #include <sys/mount.h>
-#include "libbb.h"
 
 /* device types */
 /* ------------ */
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 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
+#include "common.h"
+#include "dhcpd.h"
+#include "dhcpc.h"
+#include "options.h"
 
 //#include <features.h>
 #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
@@ -18,11 +22,6 @@
 #include <linux/if_ether.h>
 #endif
 
-#include "common.h"
-#include "dhcpd.h"
-#include "dhcpc.h"
-#include "options.h"
-
 
 /* Create a random xid */
 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 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include "common.h"
+#include "dhcpd.h"
+#include "dhcpc.h"
+
 
 //#include <features.h>
 #include <asm/types.h>
@@ -32,10 +36,6 @@
 #endif
 #include <linux/filter.h>
 
-#include "common.h"
-#include "dhcpd.h"
-#include "dhcpc.h"
-
 int FAST_FUNC udhcp_raw_socket(int ifindex)
 {
 	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 @@
  *
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
+#include "libbb.h"
+
 #include <linux/hdreg.h> /* HDIO_GETGEO */
 #include <linux/fd.h>    /* FDGETPRM */
 #include <sys/mount.h>   /* BLKSSZGET */
@@ -14,7 +16,6 @@
 # define BLKSSZGET _IO(0x12, 104)
 #endif
 //#include <linux/msdos_fs.h>
-#include "libbb.h"
 #include "volume_id/volume_id_internal.h"
 
 #define SECTOR_SIZE             512