diff --git a/lib/pengine/unpack.h b/lib/pengine/unpack.h
index df1c77452e..cac7e14a10 100644
--- a/lib/pengine/unpack.h
+++ b/lib/pengine/unpack.h
@@ -1,100 +1,98 @@
 /* 
  * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This library 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
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #ifndef PENGINE_UNPACK__H
 #  define PENGINE_UNPACK__H
 
 extern gboolean unpack_remote_nodes(xmlNode * xml_resources, pe_working_set_t * data_set);
 
 extern gboolean unpack_resources(xmlNode * xml_resources, pe_working_set_t * data_set);
 
 extern gboolean unpack_config(xmlNode * config, pe_working_set_t * data_set);
 
 extern gboolean unpack_nodes(xmlNode * xml_nodes, pe_working_set_t * data_set);
 
-extern gboolean unpack_domains(xmlNode * xml_domains, pe_working_set_t * data_set);
-
 extern gboolean unpack_tags(xmlNode * xml_tags, pe_working_set_t * data_set);
 
 extern gboolean unpack_status(xmlNode * status, pe_working_set_t * data_set);
 
 extern gboolean unpack_remote_status(xmlNode * status, pe_working_set_t * data_set);
 
 extern gint sort_op_by_callid(gconstpointer a, gconstpointer b);
 
 extern gboolean unpack_lrm_resources(node_t * node, xmlNode * lrm_state,
                                      pe_working_set_t * data_set);
 
 extern gboolean add_node_attrs(xmlNode * attrs, node_t * node, gboolean overwrite,
                                pe_working_set_t * data_set);
 
 extern gboolean determine_online_status(xmlNode * node_state, node_t * this_node,
                                         pe_working_set_t * data_set);
 
 extern const char *param_value(GHashTable * hash, xmlNode * parent, const char *name);
 
 /*
  * The man pages for both curses and ncurses suggest inclusion of "curses.h".
  * We believe the following to be acceptable and portable.
  */
 
 #  if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBCURSES)
 #    if defined(HAVE_NCURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW)
 #      include <ncurses.h>
 #      define CURSES_ENABLED 1
 #    elif defined(HAVE_NCURSES_NCURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW)
 #      include <ncurses/ncurses.h>
 #      define CURSES_ENABLED 1
 #    elif defined(HAVE_CURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW)
 #      include <curses.h>
 #      define CURSES_ENABLED 1
 #    elif defined(HAVE_CURSES_CURSES_H) && !defined(HAVE_INCOMPATIBLE_PRINTW)
 #      include <curses/curses.h>
 #      define CURSES_ENABLED 1
 #    else
 #      define CURSES_ENABLED 0
 #    endif
 #  else
 #    define CURSES_ENABLED 0
 #  endif
 
 #  if CURSES_ENABLED
 #    define status_printw(fmt, args...) printw(fmt, ##args)
 #  else
 #    define status_printw(fmt, args...) \
 	crm_err("printw support requires ncurses to be available during configure"); \
 	do_crm_log(LOG_WARNING, fmt, ##args);
 #  endif
 
 #  define status_print(fmt, args...)			\
 	if(options & pe_print_html) {			\
 		FILE *stream = print_data;		\
 		fprintf(stream, fmt, ##args);		\
 	} else if(options & pe_print_ncurses) {		\
 		status_printw(fmt, ##args);		\
 	} else if(options & pe_print_printf) {		\
 		FILE *stream = print_data;		\
 		fprintf(stream, fmt, ##args);		\
 	} else if(options & pe_print_xml) {		\
 		FILE *stream = print_data;		\
 		fprintf(stream, fmt, ##args);		\
 	} else if(options & pe_print_log) {		\
 		int log_level = *(int*)print_data;	\
 		do_crm_log(log_level, fmt, ##args);	\
 	}
 
 #endif