diff --git a/ChangeLog b/ChangeLog
index ad47024e08..3015467f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov  4 22:52:31 UTC 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* qemud/qemud.c, src/driver.h, src/internal.h, src/libvirt.c
+	src/network_driver.c: Remove unused virStateSigDispatcher()
+	internal API
+
 Tue Nov  4 22:20:31 UTC 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	Move internal error API declarations into their own file
diff --git a/qemud/qemud.c b/qemud/qemud.c
index b804c3b092..d73a87b995 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -262,9 +262,8 @@ qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED,
         break;
 
     default:
-        qemudLog(QEMUD_INFO, _("Received signal %d, dispatching to drivers"),
+        qemudLog(QEMUD_INFO, _("Received unexpected signal %d"),
                  siginfo.si_signo);
-        virStateSigDispatcher(&siginfo);
         break;
     }
 
diff --git a/src/driver.h b/src/driver.h
index d1b541f9f4..c0525a8b2a 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -11,8 +11,6 @@
 
 #include <libxml/uri.h>
 
-#include <signal.h>
-
 /*
  * List of registered drivers numbers
  */
@@ -595,12 +593,11 @@ struct _virStorageDriver {
     virDrvStorageVolGetPath volGetPath;
 };
 
+#ifdef WITH_LIBVIRTD
 typedef int (*virDrvStateInitialize) (void);
 typedef int (*virDrvStateCleanup) (void);
 typedef int (*virDrvStateReload) (void);
 typedef int (*virDrvStateActive) (void);
-#ifdef WITH_LIBVIRTD
-typedef int (*virDrvSigHandler) (siginfo_t *siginfo);
 
 typedef struct _virStateDriver virStateDriver;
 typedef virStateDriver *virStateDriverPtr;
@@ -610,7 +607,6 @@ struct _virStateDriver {
     virDrvStateCleanup     cleanup;
     virDrvStateReload      reload;
     virDrvStateActive      active;
-    virDrvSigHandler       sigHandler;
 };
 #endif
 
diff --git a/src/internal.h b/src/internal.h
index 8a8d4e132b..c4cafc7c21 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -333,12 +333,10 @@ int __virStateInitialize(void);
 int __virStateCleanup(void);
 int __virStateReload(void);
 int __virStateActive(void);
-int __virStateSigDispatcher(siginfo_t *siginfo);
 #define virStateInitialize() __virStateInitialize()
 #define virStateCleanup() __virStateCleanup()
 #define virStateReload() __virStateReload()
 #define virStateActive() __virStateActive()
-#define virStateSigDispatcher(s) __virStateSigDispatcher(s)
 #endif
 
 int __virDrvSupportsFeature (virConnectPtr conn, int feature);
diff --git a/src/libvirt.c b/src/libvirt.c
index ae16b10f5d..a1ce54cbe3 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -625,16 +625,6 @@ int __virStateActive(void) {
     return ret;
 }
 
-int __virStateSigDispatcher(siginfo_t *siginfo) {
-    int i, ret = 0;
-
-    for (i = 0 ; i < virStateDriverTabCount ; i++) {
-        if (virStateDriverTab[i]->sigHandler &&
-            virStateDriverTab[i]->sigHandler(siginfo))
-            ret = 1;
-    }
-    return ret;
-}
 #endif
 
 
diff --git a/src/network_driver.c b/src/network_driver.c
index 2caf5097e3..6de9cce076 100644
--- a/src/network_driver.c
+++ b/src/network_driver.c
@@ -1144,7 +1144,6 @@ static virStateDriver networkStateDriver = {
     networkShutdown,
     networkReload,
     networkActive,
-    NULL
 };
 
 int networkRegister(void) {