diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5a6cefd4..17782316 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -27,10 +27,10 @@ AM_CFLAGS = -Werror -Wall -pedantic
 noinst_LTLIBRARIES = libguac_common.la
 
 noinst_HEADERS = \
-    io.h         \
-    list.h
+    guac_io.h    \
+    guac_list.h
 
 libguac_common_la_SOURCES = \
-    io.c                    \
-    list.c
+    guac_io.c               \
+    guac_list.c
 
diff --git a/src/common/io.c b/src/common/guac_io.c
similarity index 98%
rename from src/common/io.c
rename to src/common/guac_io.c
index 3efeee7a..b4c87d64 100644
--- a/src/common/io.c
+++ b/src/common/guac_io.c
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "io.h"
+#include "guac_io.h"
 
 #include <unistd.h>
 
diff --git a/src/common/io.h b/src/common/guac_io.h
similarity index 100%
rename from src/common/io.h
rename to src/common/guac_io.h
diff --git a/src/common/list.c b/src/common/guac_list.c
similarity index 99%
rename from src/common/list.c
rename to src/common/guac_list.c
index 7060f5e7..517c9ec2 100644
--- a/src/common/list.c
+++ b/src/common/guac_list.c
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "list.h"
+#include "guac_list.h"
 
 #include <stdlib.h>
 #include <pthread.h>
diff --git a/src/common/list.h b/src/common/guac_list.h
similarity index 100%
rename from src/common/list.h
rename to src/common/guac_list.h