diff --git a/crm/crmd/atest.c b/crm/crmd/atest.c
index 7aab04b1a0..58be902393 100644
--- a/crm/crmd/atest.c
+++ b/crm/crmd/atest.c
@@ -1,72 +1,40 @@
-/* $Id: atest.c,v 1.9 2006/04/18 12:19:17 andrew Exp $ */
+/* $Id: atest.c,v 1.10 2006/04/19 06:08:43 andrew Exp $ */
 /* 
  * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  * 
  * 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 2.1 of the License, or (at your option) any later version.
  * 
  * This software 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 library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <portability.h>
 
 #include <sys/param.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 
-#include <apphb.h>
-
-#include <clplumbing/ipc.h>
-#include <clplumbing/Gmain_timeout.h>
-#include <clplumbing/cl_log.h>
-#include <clplumbing/cl_signal.h>
-#include <clplumbing/lsb_exitcodes.h>
-#include <clplumbing/uids.h>
-#include <clplumbing/realtime.h>
-#include <clplumbing/GSource.h>
-#include <clplumbing/cl_poll.h>
-#include <clplumbing/coredumps.h>
-
 #include <crm/crm.h>
-#include <crm/common/ctrl.h>
-#include <crm/common/ipc.h>
-#include <crm/common/xml.h>
-
-#include <crmd.h>
-#include <crmd_fsa.h>
-#include <crmd_messages.h>
-#include <crm/cib.h>
-
-#include <crm/dmalloc_wrapper.h>
-
-const char* crm_system_name = "core";
-
-gboolean process_atest_message(
-	HA_Message *msg, crm_data_t *xml_data, IPC_Channel *sender);
-
-
-GMainLoop*  mainloop = NULL;
 
 #define OPTARGS	"V?f:"
-#include <bzlib.h>
 int
 main(int argc, char ** argv)
 {
 	return 0;
 }