diff --git a/lib/Makefile.am b/lib/Makefile.am
index 365486e0..591604a3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -88,8 +88,6 @@ libmu_la_SOURCES=                                               \
         mu-xapian.hh                                            \
         mu-maildir.cc                                           \
         mu-maildir.hh                                           \
-        mu-flags.cc                                             \
-        mu-flags.hh                                             \
         mu-msg-crypto.cc                                        \
         mu-msg-doc.cc                                           \
         mu-msg-doc.hh                                           \
@@ -99,12 +97,15 @@ libmu_la_SOURCES=                                               \
         mu-msg-file.hh                                          \
         mu-msg-part.cc                                          \
         mu-msg-part.hh                                          \
-        mu-msg-prio.c                                           \
-        mu-msg-prio.h                                           \
-        mu-msg-priv.hh                                          \
-        mu-msg-sexp.cc                                          \
-        mu-msg.cc                                               \
-        mu-msg.hh
+	mu-msg-priv.hh                                          \
+	mu-msg-sexp.cc                                          \
+	mu-msg.cc                                               \
+	mu-msg.hh                                               \
+	mu-message-flags.hh                                     \
+	mu-message-flags.cc                                     \
+	mu-message-priority.hh                                  \
+	mu-message-priority.cc
+
 
 libmu_la_LIBADD=                                                \
         $(XAPIAN_LIBS)                                          \
diff --git a/mu/Makefile.am b/mu/Makefile.am
index 0dc80a18..b1dd453d 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -53,7 +53,7 @@ mu_SOURCES=                                                     \
 	mu-cmd.hh
 
 BUILT_SOURCES=                                                  \
-	mu-help-strings.h
+	mu-help-strings.inc
 
 mu-help-strings.inc: mu-help-strings.txt mu-help-strings.awk
 	 $(AM_V_GEN) $(AWK) -f ${top_srcdir}/mu/mu-help-strings.awk < $< > $@