diff --git a/lib/common/messages.c b/lib/common/messages.c
index c5b5739..25569db 100644
--- a/lib/common/messages.c
+++ b/lib/common/messages.c
@@ -12,6 +12,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#include <glib.h>
+#include <libxml/tree.h>
+
 #include <crm/msg_xml.h>
 
 /*!
@@ -144,3 +147,20 @@ create_reply_adv(xmlNode *original_request, xmlNode *xml_response_data,
 
     return reply;
 }
+
+xmlNode *
+get_message_xml(xmlNode *msg, const char *field)
+{
+    xmlNode *tmp = first_named_child(msg, field);
+
+    return __xml_first_child(tmp);
+}
+
+gboolean
+add_message_xml(xmlNode *msg, const char *field, xmlNode *xml)
+{
+    xmlNode *holder = create_xml_node(msg, field);
+
+    add_node_copy(holder, xml);
+    return TRUE;
+}
diff --git a/lib/common/xml.c b/lib/common/xml.c
index 3b555d4..6ff22b7 100644
--- a/lib/common/xml.c
+++ b/lib/common/xml.c
@@ -2615,23 +2615,6 @@ write_xml_file(xmlNode * xml_node, const char *filename, gboolean compress)
     return write_xml_stream(xml_node, filename, stream, compress);
 }
 
-xmlNode *
-get_message_xml(xmlNode * msg, const char *field)
-{
-    xmlNode *tmp = first_named_child(msg, field);
-
-    return __xml_first_child(tmp);
-}
-
-gboolean
-add_message_xml(xmlNode * msg, const char *field, xmlNode * xml)
-{
-    xmlNode *holder = create_xml_node(msg, field);
-
-    add_node_copy(holder, xml);
-    return TRUE;
-}
-
 static char *
 crm_xml_escape_shuffle(char *text, int start, int *length, const char *replace)
 {