diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index 64f350ea9..f32b7b5af 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -129,7 +129,7 @@ UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
 endif
 
 if BUILD_DARWIN
-  BEVEL_BUTTON = macosx/bevelButton.cpp
+  BEVEL_BUTTON = osx_bevelButton.cpp
 endif
 
 if FONTLISTER_FREETYPE
@@ -164,7 +164,7 @@ EXTRA_aegisub_SOURCES = \
 	dialog_associations.cpp \
 	lavc_file.cpp \
 	lavc_keyframes.cpp \
-	macosx/bevelButton.cpp \
+	osx_bevelButton.cpp \
 	setup.cpp \
 	spellchecker_hunspell.cpp \
 	stdwx.cpp \
@@ -327,7 +327,7 @@ noinst_HEADERS = \
 	$(srcdir)/boost/*.hpp \
 	gl/glext.h \
 	$(srcdir)/*.hxx \
-	macosx/bevelButton.h
+	osx_bevelButton.h
 
 EXTRA_DIST = \
 	auto4_perldata.inc \
diff --git a/aegisub/macosx/bevelButton.cpp b/aegisub/osx_bevelButton.cpp
similarity index 96%
rename from aegisub/macosx/bevelButton.cpp
rename to aegisub/osx_bevelButton.cpp
index ba4d515e2..658103e7a 100644
--- a/aegisub/macosx/bevelButton.cpp
+++ b/aegisub/osx_bevelButton.cpp
@@ -12,12 +12,12 @@
 #ifdef __WXMAC__
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bevelButton.h"
+#pragma implementation "osx_bevelButton.h"
 #endif
 
 #include "wx/wxprec.h"
 
-#include "bevelButton.h"
+#include "osx_bevelButton.h"
 #include "wx/panel.h"
 #include "wx/stockitem.h"
 
diff --git a/aegisub/macosx/bevelButton.h b/aegisub/osx_bevelButton.h
similarity index 100%
rename from aegisub/macosx/bevelButton.h
rename to aegisub/osx_bevelButton.h
diff --git a/aegisub/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp
index 78a5a072f..cb48fb3c7 100644
--- a/aegisub/subs_edit_box.cpp
+++ b/aegisub/subs_edit_box.cpp
@@ -60,7 +60,7 @@
 #include "idle_field_event.h"
 #include "float_spin.h"
 #include "tooltip_manager.h"
-#include "macosx/bevelButton.h"
+#include "osx_bevelButton.h"
 
 
 ///////////////