diff --git a/src/Makefile.am b/src/Makefile.am
index 4644c693..f17e926e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ ofonod_SOURCES = main.c ofono.h log.c plugin.c \
 		call-settings.c call-forwarding.c call-meter.c \
 		smsutil.h smsutil.c cssn.h cssn.c call-barring.c sim.h sim.c \
 		phonebook.c history.c simutil.h simutil.c \
-		message-waiting.c message-waiting.h
+		message-waiting.c
 
 ofonod_LDADD = $(top_builddir)/plugins/libbuiltin.la \
 		$(top_builddir)/drivers/libbuiltin.la \
diff --git a/src/message-waiting.c b/src/message-waiting.c
index a0d939a3..e734f3a1 100644
--- a/src/message-waiting.c
+++ b/src/message-waiting.c
@@ -40,7 +40,6 @@
 #include "sim.h"
 #include "simutil.h"
 #include "smsutil.h"
-#include "message-waiting.h"
 
 #define MESSAGE_WAITING_INTERFACE "org.ofono.MessageWaiting"
 
@@ -493,7 +492,7 @@ mbdn:
 	return FALSE;
 }
 
-void ofono_message_waiting_present_notify(struct ofono_modem *modem,
+static void ofono_message_waiting_present_notify(struct ofono_modem *modem,
 		enum sms_mwi_type type, gboolean present, int profile)
 {
 	struct message_waiting_data *mw = modem->message_waiting;
@@ -516,7 +515,7 @@ void ofono_message_waiting_present_notify(struct ofono_modem *modem,
 	}
 }
 
-void ofono_message_waiting_count_notify(struct ofono_modem *modem,
+static void ofono_message_waiting_count_notify(struct ofono_modem *modem,
 		enum sms_mwi_type type, int count, int profile)
 {
 	struct message_waiting_data *mw = modem->message_waiting;
diff --git a/src/message-waiting.h b/src/message-waiting.h
deleted file mode 100644
index c0e60bfb..00000000
--- a/src/message-waiting.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  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 St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-void ofono_message_waiting_present_notify(struct ofono_modem *modem,
-						enum sms_mwi_type type,
-						gboolean present, int profile);
-void ofono_message_waiting_count_notify(struct ofono_modem *modem,
-					enum sms_mwi_type type, int count,
-					int profile);
-
-void ofono_handle_sms_mwi(struct ofono_modem *modem,
-				struct sms *sms, gboolean *out_discard);
diff --git a/src/ofono.h b/src/ofono.h
index 4e344306..63f33adb 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -101,5 +101,9 @@ void __ofono_history_call_ended(struct ofono_modem *modem,
 void __ofono_history_call_missed(struct ofono_modem *modem,
 				const struct ofono_call *call, time_t when);
 
+struct sms;
+
 int ofono_message_waiting_register(struct ofono_modem *modem);
 void ofono_message_waiting_unregister(struct ofono_modem *modem);
+void ofono_handle_sms_mwi(struct ofono_modem *modem,
+				struct sms *sms, gboolean *out_discard);
diff --git a/src/sms.c b/src/sms.c
index 84b98de9..85f11469 100644
--- a/src/sms.c
+++ b/src/sms.c
@@ -36,7 +36,6 @@
 #include "util.h"
 #include "sim.h"
 #include "smsutil.h"
-#include "message-waiting.h"
 
 #define uninitialized_var(x) x = x