diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c8faa28..4f925405 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,11 +46,11 @@ find_package(Ogg REQUIRED)    #TODO: Not required if we aren't building the clie
 find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
 find_package(Speex REQUIRED)  #TODO: Not required if we aren't building the client
 find_package(CURL REQUIRED)
+find_package(Freetype)
 
 if(WIN32)
     find_package(PhysX REQUIRED)  #TODO: Not required if we aren't building the client
     find_package(DirectX REQUIRED)
-    find_package(Freetype)
 endif(WIN32)
 
 find_package(Bink)            #TODO: Find Bink, but don't require it if plPipeline isn't built...
diff --git a/Sources/Tools/plFontConverter/plFontConverter.cpp b/Sources/Tools/plFontConverter/plFontConverter.cpp
index 08890246..a44ef519 100644
--- a/Sources/Tools/plFontConverter/plFontConverter.cpp
+++ b/Sources/Tools/plFontConverter/plFontConverter.cpp
@@ -79,10 +79,6 @@ REGISTER_CREATABLE(plMipmap);
 
 #include <functional>
 
-HINSTANCE   gInstance;
-char        *gCommandLine = nil;
-HWND        gMainWindow = nil;
-
 static void IAboutDialog(QWidget *parent)
 {
     QDialog dlg(parent);
@@ -379,6 +375,7 @@ void plFontConverter::IImportBDF(const plFileName &path)
     IUpdateInfo();
 }
 
+#ifdef Q_OS_WIN
 struct ResRecord
 {
     HRSRC   fHandle;
@@ -414,6 +411,7 @@ static ResRecord DoSelectResource(const QList<ResRecord> &resources)
 
     return ResRecord();
 }
+#endif
 
 void plFontConverter::IImportFON(const plFileName &path)
 {