diff --git a/libfprint/fpi-assembling.c b/libfprint/fpi-assembling.c
index 6df8fff..634a50f 100644
--- a/libfprint/fpi-assembling.c
+++ b/libfprint/fpi-assembling.c
@@ -183,7 +183,7 @@ do_movement_estimation (struct fpi_frame_asmbl_ctx *ctx,
  */
 void
 fpi_do_movement_estimation (struct fpi_frame_asmbl_ctx *ctx,
-                            GSList *stripes)
+                            GSList                     *stripes)
 {
   int err, rev_err;
 
@@ -277,7 +277,7 @@ aes_blit_stripe (struct fpi_frame_asmbl_ctx *ctx,
  */
 FpImage *
 fpi_assemble_frames (struct fpi_frame_asmbl_ctx *ctx,
-                     GSList *stripes)
+                     GSList                     *stripes)
 {
   GSList *l;
   FpImage *img;
diff --git a/libfprint/fpi-log.h b/libfprint/fpi-log.h
index 177e0f7..1c3d5ad 100644
--- a/libfprint/fpi-log.h
+++ b/libfprint/fpi-log.h
@@ -80,19 +80,19 @@
  *
  * Uses fp_err() to print an error if the @condition is true.
  */
-#define BUG_ON(condition) G_STMT_START		\
-	if (condition) {			\
-		char *s;			\
-		s = g_strconcat ("BUG: (", #condition, ")", NULL); \
-		fp_err ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
-		g_free (s);			\
-	} G_STMT_END
+#define BUG_ON(condition) G_STMT_START          \
+  if (condition) {                        \
+      char *s;                        \
+      s = g_strconcat ("BUG: (", #condition, ")", NULL); \
+      fp_err ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
+      g_free (s);                     \
+    } G_STMT_END
 
 /**
  * BUG:
  *
  * Same as BUG_ON() but is always true.
  */
-#define BUG() BUG_ON(1)
+#define BUG() BUG_ON (1)
 
 #endif