diff --git a/nixd/include/nixd/Basic/DiagnosticMerge.inc b/nixd/include/nixd/Basic/DiagnosticMerge.inc
index b5df7b926..ab4da8e40 100644
--- a/nixd/include/nixd/Basic/DiagnosticMerge.inc
+++ b/nixd/include/nixd/Basic/DiagnosticMerge.inc
@@ -20,4 +20,4 @@
 #undef DIAG_BODY
 #undef DIAG_SIMPLE
 
-#endif
+#endif // DIAG_ALL
diff --git a/nixd/lib/Basic/meson.build b/nixd/lib/Basic/meson.build
index e94c002d7..10674b0d8 100644
--- a/nixd/lib/Basic/meson.build
+++ b/nixd/lib/Basic/meson.build
@@ -8,6 +8,6 @@ libnixdBasic = library('nixdBasic'
 )
 
 nixdBasic = declare_dependency( include_directories: nixd_inc
-                            , dependencies: libnixdBasicDeps
-                            , link_with: libnixdBasic
-                            )
+                              , dependencies: libnixdBasicDeps
+                              , link_with: libnixdBasic
+                              )