diff --git a/Makefile b/Makefile
index e440f72..82dec1c 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ SRCS = ./src/x49gpng/main.c \
 	./src/x49gpng/timer.c \
 	./src/x49gpng/ui_tiny_font.c \
 	./src/x49gpng/ui_regular_font.c \
-	./src/x49gpng/symbol.c \
+	./src/x49gpng/ui_symbol.c \
 	./src/x49gpng/gdbstub.c \
 	./src/x49gpng/block.c \
 	./src/x49gpng/options.c
diff --git a/src/x49gpng/ui.c b/src/x49gpng/ui.c
index 49754fe..061dd5a 100644
--- a/src/x49gpng/ui.c
+++ b/src/x49gpng/ui.c
@@ -25,8 +25,6 @@
 #include "bitmaps.h"
 #include "ui_tiny_font.h"
 #include "ui_regular_font.h"
-#include "symbol.h"
-#include "glyphname.h"
 
 #include "gdbstub.h"
 
diff --git a/src/x49gpng/glyphname.h b/src/x49gpng/ui_glyphname.h
similarity index 100%
rename from src/x49gpng/glyphname.h
rename to src/x49gpng/ui_glyphname.h
diff --git a/src/x49gpng/ui_regular_font.c b/src/x49gpng/ui_regular_font.c
index f4080fa..e9f4ebf 100644
--- a/src/x49gpng/ui_regular_font.c
+++ b/src/x49gpng/ui_regular_font.c
@@ -5,8 +5,8 @@
 #include <cairo.h>
 
 #include "options.h"
-#include "symbol.h"
-#include "glyphname.h"
+#include "ui_symbol.h"
+#include "ui_glyphname.h"
 #include "ui_regular_font.h"
 
 static void _regular_font_symbol_path( cairo_t* cr, double size, double xoffset, double yoffset, const x49gp_symbol_t* symbol )
diff --git a/src/x49gpng/symbol.c b/src/x49gpng/ui_symbol.c
similarity index 99%
rename from src/x49gpng/symbol.c
rename to src/x49gpng/ui_symbol.c
index 2768616..6083a66 100644
--- a/src/x49gpng/symbol.c
+++ b/src/x49gpng/ui_symbol.c
@@ -7,7 +7,7 @@
 #include <glib.h>
 #include <cairo.h>
 
-#include "symbol.h"
+#include "ui_symbol.h"
 
 static const cairo_path_data_t symbol_square_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.100 ), SYMBOL_LINE_TO( 0.500, 0.000 ),
                                                              SYMBOL_LINE_TO( 0.000, 0.500 ), SYMBOL_LINE_TO( -0.500, 0.000 ),
diff --git a/src/x49gpng/symbol.h b/src/x49gpng/ui_symbol.h
similarity index 100%
rename from src/x49gpng/symbol.h
rename to src/x49gpng/ui_symbol.h