diff --git a/src/Makefile.am b/src/Makefile.am
index e19a482744ae2314b036260ef3a691d2f0e62b4d..188c9c814af6fb3f8cbfcbefb86b6e1ce6e64b49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,6 @@ UTIL_SOURCES =							\
 		util/threads.c util/threads.h			\
 		util/threads-pthread.h				\
 		util/threads-win32.h				\
-		util/threadpool.c util/threadpool.h		\
 		util/uuid.c util/uuid.h				\
 		util/util.c util/util.h				\
 		util/viralloc.c util/viralloc.h			\
@@ -87,6 +86,7 @@ UTIL_SOURCES =							\
 		util/virstatslinux.c util/virstatslinux.h	\
 		util/virstoragefile.c util/virstoragefile.h	\
 		util/virsysinfo.c util/virsysinfo.h		\
+		util/virthreadpool.c util/virthreadpool.h	\
 		util/virtypedparam.c util/virtypedparam.h	\
 		util/xml.c util/xml.h				\
 		util/virterror.c util/virterror_internal.h	\
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index a798e951d2f599a38e4b9ef65ff9d30dfd4989ec..c1ab6227ca84eed0b39b4b37dac15cb73aaa239f 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -65,7 +65,7 @@
 #include "virnetdev.h"
 #include "virfile.h"
 #include "viratomic.h"
-#include "threadpool.h"
+#include "virthreadpool.h"
 #include "configmake.h"
 #include "virtime.h"
 
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index f928c2960075ab4346ad1b575f435a721ec0ec60..0d4816e917ff4bceb526ab74b081ca4d1e71f5f7 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -41,7 +41,7 @@
 # include "driver.h"
 # include "virbitmap.h"
 # include "vircommand.h"
-# include "threadpool.h"
+# include "virthreadpool.h"
 # include "locking/lock_manager.h"
 # include "qemu_capabilities.h"
 
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7359e7b79d1e395eaf9d8f962807db7f3ad0b6ce..a14cdb394bdf9d55027004efc8fe98475781829e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -84,7 +84,7 @@
 #include "virfile.h"
 #include "fdstream.h"
 #include "configmake.h"
-#include "threadpool.h"
+#include "virthreadpool.h"
 #include "locking/lock_manager.h"
 #include "locking/domain_lock.h"
 #include "virkeycode.h"
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 67cd4b5444ca08916f88a4da98c29885d66727df..26ceb0c8dda0d8ac5b73209043d2559995b7c0e4 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -32,7 +32,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "threads.h"
-#include "threadpool.h"
+#include "virthreadpool.h"
 #include "util.h"
 #include "virfile.h"
 #include "virnetservermdns.h"
diff --git a/src/util/threadpool.c b/src/util/virthreadpool.c
similarity index 99%
rename from src/util/threadpool.c
rename to src/util/virthreadpool.c
index 9d3d5d26cd999054396a2ef2a51658ee3e39e33a..5ab339ad96040ff05d9cb86c433e2b59cc6aeb32 100644
--- a/src/util/threadpool.c
+++ b/src/util/virthreadpool.c
@@ -1,5 +1,5 @@
 /*
- * threadpool.c: a generic thread pool implementation
+ * virthreadpool.c: a generic thread pool implementation
  *
  * Copyright (C) 2010 Hu Tao
  * Copyright (C) 2010 Daniel P. Berrange
@@ -25,7 +25,7 @@
 
 #include <config.h>
 
-#include "threadpool.h"
+#include "virthreadpool.h"
 #include "viralloc.h"
 #include "threads.h"
 #include "virterror_internal.h"
diff --git a/src/util/threadpool.h b/src/util/virthreadpool.h
similarity index 97%
rename from src/util/threadpool.h
rename to src/util/virthreadpool.h
index 4479647ca4749ab1dabc6b8925b99c12787f7d48..cbac6000abbfd40358447cef9d9f3dbb0ba296ac 100644
--- a/src/util/threadpool.h
+++ b/src/util/virthreadpool.h
@@ -1,5 +1,5 @@
 /*
- * threadpool.h: a generic thread pool implementation
+ * virthreadpool.h: a generic thread pool implementation
  *
  * Copyright (C) 2010 Hu Tao
  * Copyright (C) 2010 Daniel P. Berrange