diff --git a/include/link/main.h b/include/link/main.h
index fd6ec886..0bda627b 100644
--- a/include/link/main.h
+++ b/include/link/main.h
@@ -44,7 +44,7 @@ noreturn_ void fatal(char const *fmt, ...);
  * @param mode The mode to open the file with
  * @return A pointer to a valid FILE structure, or NULL if fileName was NULL
  */
-FILE * openFile(char const *fileName, char const *mode);
+FILE *openFile(char const *fileName, char const *mode);
 
 #define closeFile(file) do { \
 				FILE *tmp = file; \
diff --git a/include/link/patch.h b/include/link/patch.h
index 3e1e1012..fe59df88 100644
--- a/include/link/patch.h
+++ b/include/link/patch.h
@@ -25,7 +25,7 @@ struct Assertion {
 	 * This would be redundant with `.section->fileSymbols`... but
 	 * `section` is sometimes NULL!
 	 */
-	struct Symbol ** fileSymbols;
+	struct Symbol **fileSymbols;
 
 	struct Assertion *next;
 };
diff --git a/src/asm/symbol.c b/src/asm/symbol.c
index 02dc4149..3dd8bb3e 100644
--- a/src/asm/symbol.c
+++ b/src/asm/symbol.c
@@ -52,7 +52,7 @@ static char SavedSECOND[3];
 static bool exportall;
 
 struct ForEachArgs {
-	void (*func)(struct sSymbol *, void *);
+	void (*func)(struct sSymbol *symbol, void *arg);
 	void *arg;
 };
 
@@ -398,10 +398,10 @@ struct sSymbol *sym_AddLocalReloc(char const *tzSym)
 
 		fullSymbolName(fullname, sizeof(fullname), tzSym, pScope);
 		return sym_AddReloc(fullname);
-	} else {
-		yyerror("Local label '%s' in main scope", tzSym);
-		return NULL;
 	}
+
+	yyerror("Local label '%s' in main scope", tzSym);
+	return NULL;
 }
 
 /*
diff --git a/src/link/patch.c b/src/link/patch.c
index e4a32aab..91d9ef5d 100644
--- a/src/link/patch.c
+++ b/src/link/patch.c
@@ -366,7 +366,7 @@ void patch_CheckAssertions(struct Assertion *assert)
 	while (assert) {
 		if (!computeRPNExpr(&assert->patch,
 				    (struct Symbol const * const *)
-				    			assert->fileSymbols)) {
+							assert->fileSymbols)) {
 			switch ((enum AssertionType)assert->patch.type) {
 			case ASSERT_FATAL:
 				fatal("%s: %s", assert->patch.fileName,
diff --git a/src/link/section.c b/src/link/section.c
index 5061ed89..59a71348 100644
--- a/src/link/section.c
+++ b/src/link/section.c
@@ -64,10 +64,10 @@ static void mergeSections(struct Section *target, struct Section *other)
 		} else if (target->isAlignFixed
 			&& (other->alignMask & target->alignOfs)
 				 != (target->alignMask & other->alignOfs)) {
-				errx(1, "Section \"%s\" is defined with conflicting %u-byte alignment (offset %u) and %u-byte alignment (offset %u)",
-				     other->name, target->alignMask + 1,
-				     target->alignOfs, other->alignMask + 1,
-				     other->alignOfs);
+			errx(1, "Section \"%s\" is defined with conflicting %u-byte alignment (offset %u) and %u-byte alignment (offset %u)",
+			     other->name, target->alignMask + 1,
+			     target->alignOfs, other->alignMask + 1,
+			     other->alignOfs);
 		} else if (!target->isAlignFixed
 			|| (other->alignMask > target->alignMask)) {
 			target->isAlignFixed = true;