diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b08cf061846cdc0f985e601c011729d40e90451..c5f68e4df2a17f2c6cacc80699ec6f1575e6aefb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -138,7 +138,6 @@ src/storage/storage_driver.c
 src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
-src/util/cgroup.c
 src/util/command.c
 src/util/conf.c
 src/util/dnsmasq.c
@@ -158,6 +157,7 @@ src/util/util.c
 src/util/viraudit.c
 src/util/virauth.c
 src/util/virauthconfig.c
+src/util/vircgroup.c
 src/util/virdbus.c
 src/util/virfile.c
 src/util/virhash.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 52805e807ae5af1844b2dde9c78492dfe1bc165d..e87b0c8077560ff81a6a5e53acd7563fcf910035 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ UTIL_SOURCES =							\
 		util/buf.c util/buf.h				\
 		util/command.c util/command.h			\
 		util/conf.c util/conf.h				\
-		util/cgroup.c util/cgroup.h			\
 		util/event.c util/event.h			\
 		util/event_poll.c util/event_poll.h		\
 		util/hooks.c util/hooks.h			\
@@ -93,6 +92,7 @@ UTIL_SOURCES =							\
 		util/virtypedparam.c util/virtypedparam.h	\
 		util/xml.c util/xml.h				\
 		util/virterror.c util/virterror_internal.h	\
+		util/vircgroup.c util/vircgroup.h		\
 		util/virdbus.c util/virdbus.h			\
 		util/virhash.c util/virhash.h			\
 		util/virhashcode.c util/virhashcode.h           \
diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h
index 63a8f758b92c884e3ef45158df1a180619dbf98f..381fe37dc4c1ee579397638c69ddbf44fd3a1664 100644
--- a/src/conf/domain_audit.h
+++ b/src/conf/domain_audit.h
@@ -25,7 +25,7 @@
 # define __VIR_DOMAIN_AUDIT_H__
 
 # include "domain_conf.h"
-# include "cgroup.h"
+# include "vircgroup.h"
 
 void virDomainAuditStart(virDomainObjPtr vm,
                          const char *reason,
diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 4fe23c1180e81ad37ff823da12ed8205744c02e6..5f092de20622817ae99f365334c6af4499ec6879 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "logging.h"
 #include "memory.h"
-#include "cgroup.h"
+#include "vircgroup.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index d66f2844e20d28704145ef185e9d64e735706b73..a9c337e6aafd04855988cb7d89214b60acccfbf2 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -32,7 +32,7 @@
 # include "domain_event.h"
 # include "capabilities.h"
 # include "threads.h"
-# include "cgroup.h"
+# include "vircgroup.h"
 # include "security/security_manager.h"
 # include "configmake.h"
 # include "hostusb.h"
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 084d89d619dd12164dac273323ce4d3f873549f8..445d085a9e4927559828ba9db6504db799bc10dc 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -26,7 +26,7 @@
 #include "qemu_cgroup.h"
 #include "qemu_domain.h"
 #include "qemu_process.h"
-#include "cgroup.h"
+#include "vircgroup.h"
 #include "logging.h"
 #include "memory.h"
 #include "virterror_internal.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 1a39946d6004c57aeffeda78fe059a9a6e740914..cfa6fffba303abe9e30038eae1f88ccf40c57917 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -34,7 +34,7 @@
 # include "domain_event.h"
 # include "threads.h"
 # include "security/security_manager.h"
-# include "cgroup.h"
+# include "vircgroup.h"
 # include "pci.h"
 # include "hostusb.h"
 # include "cpu_conf.h"
diff --git a/src/util/cgroup.c b/src/util/vircgroup.c
similarity index 99%
rename from src/util/cgroup.c
rename to src/util/vircgroup.c
index 8f3b8b72440919705a7b461f65883a5bedee3591..e9fc67ff26c4fc2434470f8664de21b0c5f1aec8 100644
--- a/src/util/cgroup.c
+++ b/src/util/vircgroup.c
@@ -1,5 +1,5 @@
 /*
- * cgroup.c: Tools for managing cgroups
+ * vircgroup.c: methods for managing control cgroups
  *
  * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright IBM Corp. 2008
@@ -40,7 +40,7 @@
 #include "internal.h"
 #include "util.h"
 #include "memory.h"
-#include "cgroup.h"
+#include "vircgroup.h"
 #include "logging.h"
 #include "virfile.h"
 #include "virhash.h"
diff --git a/src/util/cgroup.h b/src/util/vircgroup.h
similarity index 97%
rename from src/util/cgroup.h
rename to src/util/vircgroup.h
index fc9e409bba4e96ff37352a6954952f0dc6acdc71..8b6d3b269d77f1766a172281c28cf63120ec03fd 100644
--- a/src/util/cgroup.h
+++ b/src/util/vircgroup.h
@@ -1,5 +1,5 @@
 /*
- * cgroup.h: Interface to tools for managing cgroups
+ * vircgroup.h: methods for managing control cgroups
  *
  * Copyright (C) 2011-2012 Red Hat, Inc.
  * Copyright IBM Corp. 2008
@@ -22,8 +22,8 @@
  *  Dan Smith <danms@us.ibm.com>
  */
 
-#ifndef CGROUP_H
-# define CGROUP_H
+#ifndef __VIR_CGROUP_H__
+# define __VIR_CGROUP_H__
 
 struct virCgroup;
 typedef struct virCgroup *virCgroupPtr;
@@ -164,4 +164,4 @@ int virCgroupKill(virCgroupPtr group, int signum);
 int virCgroupKillRecursive(virCgroupPtr group, int signum);
 int virCgroupKillPainfully(virCgroupPtr group);
 
-#endif /* CGROUP_H */
+#endif /* __VIR_CGROUP_H__ */