diff --git a/mu/Makefile.am b/mu/Makefile.am
index b1dd453d..cadc9a59 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -23,14 +23,13 @@ AM_CPPFLAGS=                                                    \
 	$(CODE_COVERAGE_CFLAGS)
 
 AM_CXXFLAGS=                                                    \
-	$(JSON_GLIB_CFLAGS)                                     \
-	-DMU_SCRIPTS_DIR="\"$(pkgdatadir)/scripts/\""
+	$(GMIME_CFLAGS)                                         \
+	-DMU_SCRIPTS_DIR="\"$(pkgdatadir)/scripts/\""           \
 	$(ASAN_CXXCFLAGS)                                       \
 	$(WARN_CXXFLAGS)                                        \
 	$(CODE_COVERAGE_CFLAGS)                                 \
 	-Wno-switch-enum
 
-
 AM_LDFLAGS=                                                     \
 	$(ASAN_LDFLAGS)
 
diff --git a/mu/mu-cmd.cc b/mu/mu-cmd.cc
index 29c20cda..9420b226 100644
--- a/mu/mu-cmd.cc
+++ b/mu/mu-cmd.cc
@@ -192,7 +192,7 @@ view_params_valid(const MuConfig* opts)
 	return Ok();
 }
 
-Mu::Result<void>
+static Mu::Result<void>
 cmd_view(const MuConfig* opts)
 {
 	if (!opts || opts->cmd != Mu::MU_CONFIG_CMD_VIEW)