diff --git a/mongoose.c b/mongoose.c
index 7f3c72ab3945b840ee0114bd558b336e01330580..da86d46808b88fc7dc5496ae6980f593dfde71f6 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -1131,7 +1131,7 @@ void MD5_Final(unsigned char digest[16], MD5_CTX *ctx) {
   memcpy(digest, ctx->buf, 16);
   memset((char *) ctx, 0, sizeof(*ctx));
 }
-#endif  /* CS_ENABLE_NATIVE_MD5 */
+#endif /* CS_ENABLE_NATIVE_MD5 */
 
 /*
  * Stringify binary data. Output buffer size must be 2 * size_of_input + 1
@@ -1443,7 +1443,8 @@ void cs_sha1_init(cs_sha1_ctx *context) {
   context->count[0] = context->count[1] = 0;
 }
 
-void cs_sha1_update(cs_sha1_ctx *context, const unsigned char *data, uint32_t len) {
+void cs_sha1_update(cs_sha1_ctx *context, const unsigned char *data,
+                    uint32_t len) {
   uint32_t i, j;
 
   j = context->count[0];
diff --git a/mongoose.h b/mongoose.h
index cbab9e092d6981da47626118f11e4a96891df176..16524dd094b5d45c215ac9044c85d39cb7b30ec7 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -139,7 +139,7 @@
 #define __func__ __FILE__ ":" STR(__LINE__)
 #endif
 #define snprintf _snprintf
-#define fileno  _fileno
+#define fileno _fileno
 #define vsnprintf _vsnprintf
 #define sleep(x) Sleep((x) *1000)
 #define to64(x) _atoi64(x)
@@ -275,10 +275,10 @@ int64_t strtoll(const char *str, char **endptr, int base);
 #ifdef CS_ENABLE_DEBUG
 
 void cs_dbg_printf(const char *fmt, ...);
-#define __DBG(x) \
-  do {                          \
+#define __DBG(x)                         \
+  do {                                   \
     fprintf(stderr, "%-20s ", __func__); \
-    cs_dbg_printf x;                   \
+    cs_dbg_printf x;                     \
   } while (0)
 #define DBG __DBG