diff --git a/aegisub/src/font_file_lister.cpp b/aegisub/src/font_file_lister.cpp
index c9ff0ab39..9ebdc8e53 100644
--- a/aegisub/src/font_file_lister.cpp
+++ b/aegisub/src/font_file_lister.cpp
@@ -44,18 +44,14 @@
 #include <wx/tokenzr.h>
 #endif
 
-#if defined(__WINDOWS__) || defined(__APPLE__)
 #ifdef WITH_FREETYPE2
 #include "font_file_lister_freetype.h"
-/// DOCME
 #define FontListerClass FreetypeFontFileLister
+#elif defined(WITH_FONTCONFIG)
+#include "font_file_lister_fontconfig.h"
+#define FontListerClass FontConfigFontFileLister
 #else
 #include "font_file_lister.h"
-#endif // WITH_FREETYPE2
-#else
-#include "font_file_lister_fontconfig.h"
-/// DOCME
-#define FontListerClass FontConfigFontFileLister
 #endif
 
 #include "standard_paths.h"
@@ -236,5 +232,3 @@ void FontFileLister::LoadCache() {
 	catch (...) {
 	}
 }
-
-
diff --git a/aegisub/src/font_file_lister.h b/aegisub/src/font_file_lister.h
index c1a2cfc08..e8823241b 100644
--- a/aegisub/src/font_file_lister.h
+++ b/aegisub/src/font_file_lister.h
@@ -44,11 +44,7 @@
 #include <wx/string.h>
 #endif
 
-
-////////////
-// Typedefs
-#if defined(__WINDOWS__) || defined(__APPLE__)
-
+#ifdef WITH_FREETYPE2
 /// DOCME
 typedef struct FT_LibraryRec_ *FT_Library;
 #endif
diff --git a/aegisub/src/font_file_lister_fontconfig.cpp b/aegisub/src/font_file_lister_fontconfig.cpp
index 9f441d04b..16c4c9da5 100644
--- a/aegisub/src/font_file_lister_fontconfig.cpp
+++ b/aegisub/src/font_file_lister_fontconfig.cpp
@@ -36,7 +36,7 @@
 
 #include "config.h"
 
-#if !defined(_WIN32) || defined(WITH_FONTCONFIG)
+#ifdef WITH_FONTCONFIG
 #include "font_file_lister_fontconfig.h"
 #include "charset_conv.h"