diff --git a/src/Makefile.am b/src/Makefile.am
index 1f6651db..9414a196 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,6 @@ libmu_la_SOURCES=			\
 	mu-msg-prio.c			\
 	mu-msg-prio.h			\
 	mu-msg-priv.h			\
-	mu-msg-status.h			\
 	mu-msg.c			\
 	mu-msg.h			\
 	mu-msg.h			\
diff --git a/src/mu-msg-status.h b/src/mu-msg-status.h
deleted file mode 100644
index afc92e5f..00000000
--- a/src/mu-msg-status.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
-** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 3 of the License, or
-** (at your option) any later version.
-**  
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**  
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software Foundation,
-** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
-**  
-*/
-
-#ifndef __MU_MSG_STATUS_H__
-#define __MU_MSG_STATUS_H__
-
-G_BEGIN_DECLS
-
-/* what kind of message is this; use by the indexer */
-enum _MuMsgStatus {
-	MU_MSG_STATUS_NEW,	  /* message is new */
-	MU_MSG_STATUS_UPDATE,	  /* message is to be updated */
-	MU_MSG_STATUS_CLEANUP,	  /* message is to be cleaned up from db */
-	MU_MSG_STATUS_CLEANED_UP, /* message has been cleaned up from db */
-	MU_MSG_STATUS_EXISTS,	  /* message exists (will not be cleaned up) */
-	MU_MSG_STATUS_UPTODATE	  /* message is up-to-date */
-};
-typedef enum _MuMsgStatus MuMsgStatus;
-
-G_END_DECLS
-
-#endif /*__MU_MSG_STATUS_H__*/
diff --git a/src/mu-msg.h b/src/mu-msg.h
index 38a29939..2e5cea59 100644
--- a/src/mu-msg.h
+++ b/src/mu-msg.h
@@ -22,12 +22,23 @@
 
 #include <mu-msg-flags.h>
 #include <mu-msg-fields.h>
-#include <mu-msg-status.h>
 #include <mu-msg-prio.h>
 #include <mu-util.h> /* for MuResult, MuError */
 
 G_BEGIN_DECLS
 
+/* what kind of message is this; use by the indexer */
+enum _MuMsgStatus {
+	MU_MSG_STATUS_NEW,	  /* message is new */
+	MU_MSG_STATUS_UPDATE,	  /* message is to be updated */
+	MU_MSG_STATUS_CLEANUP,	  /* message is to be cleaned up from db */
+	MU_MSG_STATUS_CLEANED_UP, /* message has been cleaned up from db */
+	MU_MSG_STATUS_EXISTS,	  /* message exists (will not be cleaned up) */
+	MU_MSG_STATUS_UPTODATE	  /* message is up-to-date */
+};
+typedef enum _MuMsgStatus MuMsgStatus;
+
+
 struct _MuMsg;
 typedef struct _MuMsg MuMsg;
 
diff --git a/src/mu-query.cc b/src/mu-query.cc
index 9c1f7f23..b3eed3ad 100644
--- a/src/mu-query.cc
+++ b/src/mu-query.cc
@@ -1,5 +1,5 @@
 /* 
-** Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
 
 #include <stdexcept>
 #include <string>
-
 #include <cctype>
 #include <cstring>
 #include <stdlib.h>
@@ -36,7 +35,6 @@
 #include "mu-util.h"
 #include "mu-util-db.h"
 #include "mu-str.h"
-#include "mu-result.h"
 
 /*
  * custom parser for date ranges
diff --git a/toys/mug/mug-msg-list-view.h b/toys/mug/mug-msg-list-view.h
index 147fe850..db2a247d 100644
--- a/toys/mug/mug-msg-list-view.h
+++ b/toys/mug/mug-msg-list-view.h
@@ -21,7 +21,7 @@
 #define __MUG_MSG_LIST_VIEW_H__
 
 #include <gtk/gtk.h>
-#include <mu-result.h>
+#include <mu-util.h>
 
 G_BEGIN_DECLS
 /* convenience macros */