diff --git a/lib/ivis_common/Makefile.am b/lib/ivis_common/Makefile.am
index 060c33d6f..128b1f77d 100644
--- a/lib/ivis_common/Makefile.am
+++ b/lib/ivis_common/Makefile.am
@@ -1,9 +1,9 @@
 noinst_LIBRARIES = libivis_common.a
 noinst_HEADERS = bitimage.h imd.h ivi.h ivisdef.h \
 	ivispatch.h pieblitfunc.h pieclip.h piedef.h piefunc.h piemode.h piepalette.h \
-	piestate.h pietypes.h png.h rendfunc.h rendmode.h tex.h textdraw.h
+	piestate.h pietypes.h png_util.h rendfunc.h rendmode.h tex.h textdraw.h
 
-libivis_common_a_SOURCES = bitimage.c imd.c imdload.c png.c pieclip.c \
+libivis_common_a_SOURCES = bitimage.c imd.c imdload.c png_util.c pieclip.c \
 	piestate.c
 
 libivis_common_a_LIBADD = $(top_builddir)/lib/framework/libframework.a
diff --git a/lib/ivis_common/Makefile.raw b/lib/ivis_common/Makefile.raw
index 32b0ec78e..622954a96 100644
--- a/lib/ivis_common/Makefile.raw
+++ b/lib/ivis_common/Makefile.raw
@@ -6,7 +6,7 @@ SRC=bitimage.c \
 	imdload.c \
 	pieclip.c \
 	piestate.c \
-	png.c
+	png_util.c
 
 LIB=ivis_common
 
diff --git a/lib/ivis_common/png.c b/lib/ivis_common/png_util.c
similarity index 99%
rename from lib/ivis_common/png.c
rename to lib/ivis_common/png_util.c
index 416ad1cbe..b5a6a06f4 100644
--- a/lib/ivis_common/png.c
+++ b/lib/ivis_common/png_util.c
@@ -20,7 +20,7 @@
 
 #include "lib/framework/frame.h"
 
-#include "png.h"
+#include "png_util.h"
 #ifdef WZ_OS_MAC
 #include <Png/png.h>
 #else
diff --git a/lib/ivis_common/png.h b/lib/ivis_common/png_util.h
similarity index 100%
rename from lib/ivis_common/png.h
rename to lib/ivis_common/png_util.h
diff --git a/lib/ivis_opengl/screen.c b/lib/ivis_opengl/screen.c
index c13c6b7f7..a62470e02 100644
--- a/lib/ivis_opengl/screen.c
+++ b/lib/ivis_opengl/screen.c
@@ -30,7 +30,7 @@
 #include <SDL/SDL_opengl.h>
 #include <physfs.h>
 #include <png.h>
-#include "lib/ivis_common/png.h"
+#include "lib/ivis_common/png_util.h"
 
 #include "lib/framework/frameint.h"
 #include "lib/ivis_common/piestate.h"
diff --git a/lib/ivis_opengl/tex.c b/lib/ivis_opengl/tex.c
index 74c86c2f1..ccc0dd3b7 100644
--- a/lib/ivis_opengl/tex.c
+++ b/lib/ivis_opengl/tex.c
@@ -32,7 +32,7 @@
 #include "lib/ivis_common/rendmode.h"
 #include "lib/ivis_common/piepalette.h"
 #include "lib/ivis_common/ivispatch.h"
-#include "lib/ivis_common/png.h"
+#include "lib/ivis_common/png_util.h"
 
 #include "screen.h"
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9eabffe96..5cc466d6f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,7 +21,7 @@ lib/ivis_common/imd.c
 lib/ivis_common/pieclip.c
 lib/ivis_common/bitimage.c
 lib/ivis_common/piestate.c
-lib/ivis_common/png.c
+lib/ivis_common/png_util.c
 lib/gamelib/hashtabl.c
 lib/gamelib/anim.c
 lib/gamelib/gtime.c
diff --git a/src/data.c b/src/data.c
index b35cdffc7..2a2340333 100644
--- a/src/data.c
+++ b/src/data.c
@@ -62,7 +62,7 @@
 #include "display3d.h"
 #include "display3ddef.h"
 #include "init.h"
-#include "lib/ivis_common/png.h"
+#include "lib/ivis_common/png_util.h"
 
 #include "multiplay.h"
 #include "lib/netplay/netplay.h"