diff --git a/e2fsprogs/ext2fs/bb_inode.c b/e2fsprogs/ext2fs/bb_inode.c
index 9af117d8f..8a840d9d7 100644
--- a/e2fsprogs/ext2fs/bb_inode.c
+++ b/e2fsprogs/ext2fs/bb_inode.c
@@ -147,7 +147,7 @@ cleanup:
  * indirect blocks.
  */
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
 				e2_blkcnt_t blockcnt,
diff --git a/e2fsprogs/ext2fs/block.c b/e2fsprogs/ext2fs/block.c
index 18be2a5e8..94e96c5c4 100644
--- a/e2fsprogs/ext2fs/block.c
+++ b/e2fsprogs/ext2fs/block.c
@@ -404,7 +404,7 @@ struct xlate {
 };
 
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 static int xlate_func(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
 		      blk_t ref_block EXT2FS_ATTR((unused)),
diff --git a/e2fsprogs/ext2fs/flushb.c b/e2fsprogs/ext2fs/flushb.c
index 9f04647ec..af7216a91 100644
--- a/e2fsprogs/ext2fs/flushb.c
+++ b/e2fsprogs/ext2fs/flushb.c
@@ -67,14 +67,14 @@ errcode_t ext2fs_sync_device(int fd, int flushb)
 			return 0;
 #else
 #ifdef __GNUC__
- #warning BLKFLSBUF not defined
+# warning BLKFLSBUF not defined
 #endif /* __GNUC__ */
 #endif
 #ifdef FDFLUSH
 		ioctl (fd, FDFLUSH, 0);   /* In case this is a floppy */
 #else
 #ifdef __GNUC__
- #warning FDFLUSH not defined
+# warning FDFLUSH not defined
 #endif /* __GNUC__ */
 #endif
 	}
diff --git a/e2fsprogs/ext2fs/get_pathname.c b/e2fsprogs/ext2fs/get_pathname.c
index 000479096..18bb6d271 100644
--- a/e2fsprogs/ext2fs/get_pathname.c
+++ b/e2fsprogs/ext2fs/get_pathname.c
@@ -35,7 +35,7 @@ struct get_pathname_struct {
 };
 
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 static int get_pathname_proc(struct ext2_dir_entry *dirent,
 			     int	offset EXT2FS_ATTR((unused)),
diff --git a/e2fsprogs/ext2fs/ismounted.c b/e2fsprogs/ext2fs/ismounted.c
index 125fe244b..381194320 100644
--- a/e2fsprogs/ext2fs/ismounted.c
+++ b/e2fsprogs/ext2fs/ismounted.c
@@ -284,7 +284,7 @@ static int is_swap_device(const char *file)
  * characters.
  */
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,
 				  char *mtpt, int mtlen)
diff --git a/e2fsprogs/ext2fs/link.c b/e2fsprogs/ext2fs/link.c
index 281ad065f..6fb307638 100644
--- a/e2fsprogs/ext2fs/link.c
+++ b/e2fsprogs/ext2fs/link.c
@@ -92,7 +92,7 @@ static int link_proc(struct ext2_dir_entry *dirent,
  * entry filetype.
  */
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
 		      ext2_ino_t ino, int flags)
diff --git a/e2fsprogs/ext2fs/lookup.c b/e2fsprogs/ext2fs/lookup.c
index 9cb97f1b5..76c5ac871 100644
--- a/e2fsprogs/ext2fs/lookup.c
+++ b/e2fsprogs/ext2fs/lookup.c
@@ -26,7 +26,7 @@ struct lookup_struct  {
 };
 
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 static int lookup_proc(struct ext2_dir_entry *dirent,
 		       int	offset EXT2FS_ATTR((unused)),
diff --git a/e2fsprogs/ext2fs/read_bb.c b/e2fsprogs/ext2fs/read_bb.c
index 226c5375a..7612e674f 100644
--- a/e2fsprogs/ext2fs/read_bb.c
+++ b/e2fsprogs/ext2fs/read_bb.c
@@ -35,7 +35,7 @@ struct read_bb_record {
  * Helper function for ext2fs_read_bb_inode()
  */
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 static int mark_bad_block(ext2_filsys fs, blk_t *block_nr,
 			  e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
diff --git a/e2fsprogs/ext2fs/unlink.c b/e2fsprogs/ext2fs/unlink.c
index a6ab53ae8..6ad3c4e3a 100644
--- a/e2fsprogs/ext2fs/unlink.c
+++ b/e2fsprogs/ext2fs/unlink.c
@@ -28,7 +28,7 @@ struct link_struct  {
 };
 
 #ifdef __TURBOC__
- #pragma argsused
+# pragma argsused
 #endif
 static int unlink_proc(struct ext2_dir_entry *dirent,
 		     int	offset EXT2FS_ATTR((unused)),
diff --git a/include/platform.h b/include/platform.h
index 699de8f02..ea2983d30 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -44,28 +44,28 @@
 #endif
 
 #ifndef ATTRIBUTE_UNUSED
-#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif /* ATTRIBUTE_UNUSED */
 
 #ifndef ATTRIBUTE_NORETURN
-#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
 #endif /* ATTRIBUTE_NORETURN */
 
 #ifndef ATTRIBUTE_PACKED
-#define ATTRIBUTE_PACKED __attribute__ ((__packed__))
+# define ATTRIBUTE_PACKED __attribute__ ((__packed__))
 #endif /* ATTRIBUTE_PACKED */
 
 #ifndef ATTRIBUTE_ALIGNED
-#define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m)))
+# define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m)))
 #endif /* ATTRIBUTE_ALIGNED */
 
 /* -fwhole-program makes all symbols local. The attribute externally_visible
    forces a symbol global.  */
 #ifndef ATTRIBUTE_EXTERNALLY_VISIBLE
 # if __GNUC_PREREQ (4,1)
-# define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__))
+#  define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__))
 # else
-# define ATTRIBUTE_EXTERNALLY_VISIBLE
+#  define ATTRIBUTE_EXTERNALLY_VISIBLE
 # endif /* GNUC >= 4.1 */
 #endif /* ATTRIBUTE_EXTERNALLY_VISIBLE */
 
@@ -80,26 +80,26 @@
 
 /* ---- Endian Detection ------------------------------------ */
 #ifndef __APPLE__
-    #include <byteswap.h>
-    #include <endian.h>
+# include <byteswap.h>
+# include <endian.h>
 #endif
 
 #ifdef __BIG_ENDIAN__
-	#define BB_BIG_ENDIAN 1
-	#define BB_LITTLE_ENDIAN 0
+# define BB_BIG_ENDIAN 1
+# define BB_LITTLE_ENDIAN 0
 #elif __BYTE_ORDER == __BIG_ENDIAN
-	#define BB_BIG_ENDIAN 1
-	#define BB_LITTLE_ENDIAN 0
+# define BB_BIG_ENDIAN 1
+# define BB_LITTLE_ENDIAN 0
 #else
-	#define BB_BIG_ENDIAN 0
-	#define BB_LITTLE_ENDIAN 1
+# define BB_BIG_ENDIAN 0
+# define BB_LITTLE_ENDIAN 1
 #endif
 
 /* ---- Networking ------------------------------------------ */
 #ifndef __APPLE__
-#include <arpa/inet.h>
+# include <arpa/inet.h>
 #else
-#include <netinet/in.h>
+# include <netinet/in.h>
 #endif
 
 /* ---- miscellaneous --------------------------------------- */
diff --git a/libbb/sha1.c b/libbb/sha1.c
index f0d952f84..128d4b98f 100644
--- a/libbb/sha1.c
+++ b/libbb/sha1.c
@@ -147,13 +147,13 @@ void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx)
 void *sha1_end(void *resbuf, sha1_ctx_t *ctx)
 {
 	/* SHA1 Final padding and digest calculation  */
-	#if BB_BIG_ENDIAN
-		static uint32_t mask[4] = { 0x00000000, 0xff000000, 0xffff0000, 0xffffff00 };
-		static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 };
-	#else
-		static uint32_t mask[4] = { 0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff };
-		static uint32_t bits[4] = { 0x00000080, 0x00008000, 0x00800000, 0x80000000 };
-	#endif /* __BYTE_ORDER */
+#if BB_BIG_ENDIAN
+	static uint32_t mask[4] = { 0x00000000, 0xff000000, 0xffff0000, 0xffffff00 };
+	static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 };
+#else
+	static uint32_t mask[4] = { 0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff };
+	static uint32_t bits[4] = { 0x00000080, 0x00008000, 0x00800000, 0x80000000 };
+#endif /* __BYTE_ORDER */
 
 	uint8_t *hval = resbuf;
 	uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK);