diff --git a/src/Makefile b/src/Makefile
index 36242d7..16b9f4c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,9 +31,10 @@ apk-objs		:= apk.o \
 			   app_index.o app_fetch.o app_verify.o app_dot.o \
 			   app_audit.o
 
-libapk.so-objs		:= common.o database.o package.o archive.o \
-			   version.o io.o url.o gunzip.o blob.o hash.o print.o \
-			   commit.o solver.o
+libapk.so-objs		:= common.o database.o package.o commit.o solver.o \
+			   version.o blob.o hash.o print.o \
+			   io.o io_url.o io_gunzip.o io_archive.o
+
 libapk.so-libs		:= libfetch/libfetch.a
 
 ifeq ($(TEST),y)
diff --git a/src/archive.c b/src/io_archive.c
similarity index 99%
rename from src/archive.c
rename to src/io_archive.c
index 226bc23..22145ab 100644
--- a/src/archive.c
+++ b/src/io_archive.c
@@ -1,4 +1,4 @@
-/* archive.c - Alpine Package Keeper (APK)
+/* io_archive.c - Alpine Package Keeper (APK)
  *
  * Copyright (C) 2005-2008 Natanael Copa <n@tanael.org>
  * Copyright (C) 2008-2011 Timo Teräs <timo.teras@iki.fi>
diff --git a/src/gunzip.c b/src/io_gunzip.c
similarity index 99%
rename from src/gunzip.c
rename to src/io_gunzip.c
index 96138b0..b7fa9f4 100644
--- a/src/gunzip.c
+++ b/src/io_gunzip.c
@@ -1,4 +1,4 @@
-/* gunzip.c - Alpine Package Keeper (APK)
+/* io_gunzip.c - Alpine Package Keeper (APK)
  *
  * Copyright (C) 2008-2011 Timo Teräs <timo.teras@iki.fi>
  * All rights reserved.
diff --git a/src/url.c b/src/io_url.c
similarity index 98%
rename from src/url.c
rename to src/io_url.c
index a7e5a96..cd3f26c 100644
--- a/src/url.c
+++ b/src/io_url.c
@@ -1,4 +1,4 @@
-/* url.c - Alpine Package Keeper (APK)
+/* io_url.c - Alpine Package Keeper (APK)
  *
  * Copyright (C) 2005-2008 Natanael Copa <n@tanael.org>
  * Copyright (C) 2008-2011 Timo Teräs <timo.teras@iki.fi>