diff --git a/contrib/bobtoolz/StdAfx.h b/contrib/bobtoolz/StdAfx.h
index 3e8832dc..5e90a887 100644
--- a/contrib/bobtoolz/StdAfx.h
+++ b/contrib/bobtoolz/StdAfx.h
@@ -35,7 +35,7 @@
 
 #include "time.h"
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 // Necessary for proper boolean type declaration
 #include "qertypes.h"
@@ -116,7 +116,7 @@ typedef struct tagRECT
 
 typedef uint UINT;
 
-#endif // __linux__
+#endif // defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 #include "synapse.h"
 #include "iplugin.h"
diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp
index 4ae16b42..f4e47843 100644
--- a/contrib/bobtoolz/misc.cpp
+++ b/contrib/bobtoolz/misc.cpp
@@ -195,7 +195,7 @@ extern const char* PLUGIN_NAME;
     return buffer;
    }*/
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 // the bCreateConsole parameter is ignored on linux ..
 bool Q_Exec( const char *pCmd, bool bCreateConsole ){
 	switch ( fork() )
diff --git a/contrib/camera/funchandlers.cpp b/contrib/camera/funchandlers.cpp
index 8f568877..ddbea474 100644
--- a/contrib/camera/funchandlers.cpp
+++ b/contrib/camera/funchandlers.cpp
@@ -29,7 +29,7 @@
 extern GtkWidget *g_pEditModeAddRadioButton;
 
 char* Q_realpath( const char *path, char *resolved_path, size_t size ){
-#if defined  ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	return realpath( path, resolved_path );
 #else
 	return _fullpath( resolved_path, path, size );
diff --git a/contrib/gtkgensurf/gensurf.h b/contrib/gtkgensurf/gensurf.h
index fdfa0f3e..9bb24f0a 100644
--- a/contrib/gtkgensurf/gensurf.h
+++ b/contrib/gtkgensurf/gensurf.h
@@ -35,7 +35,7 @@
 #define PLUGIN
 #define Q3RADIANT
 
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 template <class T>
 inline T min( T x, T y ) { return ( x < y ) ? x : y; }
 template <class T>
diff --git a/contrib/prtview/prtview.cpp b/contrib/prtview/prtview.cpp
index 97c69e62..cbbdcf75 100644
--- a/contrib/prtview/prtview.cpp
+++ b/contrib/prtview/prtview.cpp
@@ -73,7 +73,7 @@ void InitInstance(){
 	strcat( INIfn, fn_dir );
 	strcat( INIfn, fn_name );
 	strcat( INIfn, ".ini" );
-#else // if def __linux__
+#else // if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	strcpy( INIfn, g_get_home_dir() );
 	strcat( INIfn, "/.radiant/" );
 	strcat( INIfn, RADIANT_VERSION );
@@ -166,7 +166,7 @@ _QERQglTable g_QglTable;
 
 #define CONFIG_SECTION "Configuration"
 
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 static bool read_var( const char *filename, const char *section, const char *key, char *value ){
 	char line[1024], *ptr;
@@ -316,7 +316,7 @@ static bool save_var( const char *filename, const char *section, const char *key
 #endif
 
 int INIGetInt( const char *key, int def ){
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	char value[1024];
 
 	if ( read_var( INIfn, CONFIG_SECTION, key, value ) ) {
@@ -339,7 +339,7 @@ void INISetInt( const char *key, int val, const char *comment /* = NULL */ ){
 	else{
 		sprintf( s, "%d", val );
 	}
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	save_var( INIfn, CONFIG_SECTION, key, s );
 #else
 	WritePrivateProfileString( CONFIG_SECTION, key, s, INIfn );
diff --git a/contrib/prtview/stdafx.h b/contrib/prtview/stdafx.h
index 3910aa59..5b9d9093 100644
--- a/contrib/prtview/stdafx.h
+++ b/contrib/prtview/stdafx.h
@@ -24,7 +24,7 @@
 #include <gtk/gtk.h>
 #include <stdint.h>
 
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <GL/glx.h>
 
 // Necessary for proper boolean type declaration
@@ -46,7 +46,7 @@ typedef int BOOL;
 #define IDOK                1
 #define IDCANCEL            2
 
-#endif // __linux__
+#endif // defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 #include "synapse.h"
 
diff --git a/include/igl.h b/include/igl.h
index db857ec5..e7f6fcbe 100644
--- a/include/igl.h
+++ b/include/igl.h
@@ -29,7 +29,7 @@
 #ifndef __IGL_H__
 #define __IGL_H__
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <GL/glx.h>
 #endif
 
diff --git a/libs/cmdlib/cmdlib.cpp b/libs/cmdlib/cmdlib.cpp
index b27919ff..3e26a06f 100644
--- a/libs/cmdlib/cmdlib.cpp
+++ b/libs/cmdlib/cmdlib.cpp
@@ -28,7 +28,7 @@
 #ifdef _WIN32
   #include <windows.h>
 #endif
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <unistd.h>
 #endif
 
@@ -36,7 +36,7 @@
 // NOTE: we don't use this crap .. with the total mess of mixing win32/unix paths we need to recognize both '/' and '\\'
 #define PATHSEPERATOR   '/'
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 bool Q_Exec( const char *cmd, char *cmdline, const char *execdir, bool bCreateConsole ){
 	char fullcmd[2048];
 	char *pCmd;
diff --git a/libs/l_net/l_net.c b/libs/l_net/l_net.c
index 385751b2..e7d756ec 100644
--- a/libs/l_net/l_net.c
+++ b/libs/l_net/l_net.c
@@ -81,7 +81,7 @@ int Net_AddressCompare( address_t *addr1, address_t *addr2 ){
 #ifdef _WIN32
 	return stricmp( addr1->ip, addr2->ip );
 #endif
-#if __linux__ || __APPLE__
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	return strcasecmp( addr1->ip, addr2->ip );
 #endif
 } //end of the function Net_AddressCompare
diff --git a/libs/pak/pakstuff.cpp b/libs/pak/pakstuff.cpp
index 9fb89e70..b22fe998 100644
--- a/libs/pak/pakstuff.cpp
+++ b/libs/pak/pakstuff.cpp
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <dirent.h>
 #endif
 #ifdef _WIN32
@@ -71,7 +71,7 @@ struct PK3FileInfo
 
 #ifdef LOG_PAKFAIL
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #include <pwd.h>
 #endif
@@ -82,7 +82,7 @@ class LogFile
 public:
 FILE *m_pFile;
 LogFile( const char* pName ){
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	// leo: use ~/.q3a/radiant/paklog instead of /tmp/paklog.txt
 	char *home = NULL;
 
@@ -869,7 +869,7 @@ void WINAPI InitPakFile( const char * pBasePath, const char *pName ){
 
 	if ( pName == NULL ) {
 		//++timo FIXME: use some kind of compatibility lib here!
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		char cWork[WORK_LEN];
 		struct dirent *dirlist;
 		DIR *dir;
diff --git a/libs/str.h b/libs/str.h
index 0ee38f81..9722b76d 100644
--- a/libs/str.h
+++ b/libs/str.h
@@ -75,7 +75,7 @@ inline char* Q_StrDup( const char* pStr ) {
 	return strcpy( new char[strlen( pStr ) + 1], pStr );
 }
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #define strcmpi strcasecmp
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
diff --git a/libs/synapse.h b/libs/synapse.h
index 71b83cdf..5d7c0a8a 100644
--- a/libs/synapse.h
+++ b/libs/synapse.h
@@ -48,7 +48,7 @@
   #include <sys/types.h>
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <dlfcn.h>
   #include <dirent.h>
 #endif
@@ -59,7 +59,7 @@
 
 #if defined( _WIN32 )
   #define SYNAPSE_DLL_EXPORT WINAPI
-#elif defined( __linux__ ) || defined( __APPLE__ )  /* ydnar */
+#elif defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )  /* ydnar */
   #define SYNAPSE_DLL_EXPORT
 #else
   #error unknown architecture
@@ -459,7 +459,7 @@ public:
 /*!
    \todo cleanup, make that private with accessors
  */
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 void *mpDLL;   ///< handle to the shared object (invalid if SYN_BUILTIN)
 #elif defined( _WIN32 )
 HMODULE mpDLL;   ///< handle to the shared object (invalid if SYN_BUILTIN)
diff --git a/libs/synapse/synapse.cpp b/libs/synapse/synapse.cpp
index 74cc07f3..c83916a0 100644
--- a/libs/synapse/synapse.cpp
+++ b/libs/synapse/synapse.cpp
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 
 #include "synapse.h"
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <dirent.h>
 #endif
 
@@ -145,7 +145,7 @@ bool CSynapseServer::Initialize( const char* conf_file, PFN_SYN_PRINTF_VA pf ){
 				// too small to be isolated in win32/ and linux/ directories..
 #if defined( _WIN32 )
 				const char* ext_so = ".dll";
-#elif defined ( __linux__ ) || defined ( __APPLE__ )
+#elif defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 				const char* ext_so = ".so";
 #endif
 				const char* ext = strrchr( name, '.' );
@@ -221,7 +221,7 @@ void CSynapseClientSlot::ReleaseSO(){
 	mpDLL = NULL;
 }
 
-#elif defined( __linux__ ) || defined ( __APPLE__ )
+#elif defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 void CSynapseServer::EnumerateInterfaces( Str &soname ){
 	CSynapseClientSlot slot;
 	slot.mpDLL = dlopen( soname.GetBuffer(), RTLD_NOW );
diff --git a/plugins/textool/StdAfx.h b/plugins/textool/StdAfx.h
index b1ddbfc7..cb79983b 100644
--- a/plugins/textool/StdAfx.h
+++ b/plugins/textool/StdAfx.h
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 // Necessary for proper boolean type declaration
 #include "qertypes.h"
@@ -79,7 +79,7 @@ typedef struct tagRECT
 	long bottom;
 } RECT, *PRECT, *LPRECT;
 
-#endif // __linux__
+#endif // defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 // plugin
 // FIXME TTimo: drop this
diff --git a/plugins/vfspak/vfs.cpp b/plugins/vfspak/vfs.cpp
index 1c72c79b..5b9221df 100644
--- a/plugins/vfspak/vfs.cpp
+++ b/plugins/vfspak/vfs.cpp
@@ -43,7 +43,7 @@
 
 #include <glib.h>
 #include <stdio.h>
-#if defined __linux__ || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	#include <dirent.h>
 	#include <unistd.h>
 	#define WINAPI
diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index c556d0a5..338465cb 100644
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <dirent.h>
   #include <unistd.h>
 #else
diff --git a/plugins/vfsqlpk3/vfs.cpp b/plugins/vfsqlpk3/vfs.cpp
index 160c860b..c0db31ff 100644
--- a/plugins/vfsqlpk3/vfs.cpp
+++ b/plugins/vfsqlpk3/vfs.cpp
@@ -44,7 +44,7 @@
 #include <glib.h>
 #include <stdio.h>
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <dirent.h>
   #include <unistd.h>
 #else
diff --git a/plugins/vfswad/vfs.cpp b/plugins/vfswad/vfs.cpp
index 70ff2888..eaaf0e04 100644
--- a/plugins/vfswad/vfs.cpp
+++ b/plugins/vfswad/vfs.cpp
@@ -44,7 +44,7 @@
 #include <glib.h>
 #include <stdio.h>
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <dirent.h>
   #include <unistd.h>
 #else
@@ -119,7 +119,7 @@ int vfsBuildShortPathName( const char* pPath, char* pBuffer, int nBufferLen ){
 		strcpy( pBuffer, pPath );               // Use long filename
 	}
 	return nResult;
-#elif defined ( __linux__ ) || defined ( __APPLE__ )
+#elif defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 	// remove /../ from directories
 	const char *scr = pPath; char *dst = pBuffer;
diff --git a/radiant/eclass.cpp b/radiant/eclass.cpp
index a02b3363..c4e96e9f 100644
--- a/radiant/eclass.cpp
+++ b/radiant/eclass.cpp
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 #include <sys/stat.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <dirent.h>
 #endif
 #include "assert.h"
diff --git a/radiant/error.cpp b/radiant/error.cpp
index b9a03d2f..736e0b3d 100644
--- a/radiant/error.cpp
+++ b/radiant/error.cpp
@@ -22,7 +22,7 @@
 #define UNICODE
 #include "stdafx.h"
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #endif
 
@@ -52,7 +52,7 @@ void Error( const char *error, ... ){
 
 	strcat( text, "\n" );
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	if ( errno != 0 ) {
 		strcat( text, "errno: " );
 		strcat( text, strerror( errno ) );
diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index ca37aa52..05d49c77 100644
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -35,7 +35,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #endif
 
diff --git a/radiant/main.cpp b/radiant/main.cpp
index 2bfd7010..a30e6e5f 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <gdk/gdkx.h>
   #include <pwd.h>
   #include <unistd.h>
@@ -118,7 +118,7 @@ static void create_splash() {
 // =============================================================================
 // Loki stuff
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 /* A short game name, could be used as argv[0] */
 static char game_name[100] = "";
@@ -480,7 +480,7 @@ int mainRadiant( int argc, char* argv[] ) {
 		#endif
 	}
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	// Give away unnecessary root privileges.
 	// Important: must be done before calling gtk_init().
 	char *loginname;
@@ -578,7 +578,7 @@ int mainRadiant( int argc, char* argv[] ) {
 
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	Str home;
 	home = g_get_home_dir();
 	AddSlash( home );
@@ -860,7 +860,7 @@ int mainRadiant( int argc, char* argv[] ) {
 		return 1;
 	}
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	if ( ( qglXQueryExtension == NULL ) || ( qglXQueryExtension( gdk_x11_get_default_xdisplay(), NULL, NULL ) != True ) ) {
 		Sys_FPrintf( SYS_ERR, "glXQueryExtension failed\n" );
 		_exit( 1 );
@@ -1128,7 +1128,7 @@ void SaveWithRegion( char *name ){
 	Map_SaveFile( name, region_active );
 }
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 typedef struct {
 	pid_t pid;
 	int status;
@@ -1240,7 +1240,7 @@ void RunBsp( char *command ){
 			strSys += "\n";
 		};
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 		// write qe3bsp.sh
 		sprintf( batpath, "%sqe3bsp.sh", temppath );
@@ -1269,7 +1269,7 @@ void RunBsp( char *command ){
 
 		Pointfile_Delete();
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		bsp_child_process_t *process = ( bsp_child_process_t *) malloc( sizeof( bsp_child_process_t ) );
 		memset( process, 0, sizeof( *process ) );
 
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index ffa42a86..1091e1f6 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -31,7 +31,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkprivate.h>
 #include <sys/stat.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <unistd.h>
 #endif
 #include "gtkmisc.h"
@@ -2161,7 +2161,7 @@ void Clipboard_PasteMap(){
    Platform-independent GTK clipboard support.
    \todo Using GDK_SELECTION_CLIPBOARD fails on win32, so we use the win32 API directly for now.
  */
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 enum
 {
@@ -3586,7 +3586,7 @@ void MainFrame::LoadCommandMap(){
 	int j;
 
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	strINI = g_PrefsDlg.m_rc_path->str;
 #elif defined( WIN32 )
 	strINI = g_strGameToolsPath;
diff --git a/radiant/map.cpp b/radiant/map.cpp
index 50985561..3696d4e8 100644
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -22,7 +22,7 @@
 #include "stdafx.h"
 #include <glib/gi18n.h>
 #include <string.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #endif
 #include "preferences.h"
diff --git a/radiant/missing.cpp b/radiant/missing.cpp
index c220e62e..9f88c88f 100644
--- a/radiant/missing.cpp
+++ b/radiant/missing.cpp
@@ -38,7 +38,7 @@
 #include "qsysprintf.h"
 #include "qe3.h"
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/radiant/pluginentities.cpp b/radiant/pluginentities.cpp
index 5fc32c87..833f3bed 100644
--- a/radiant/pluginentities.cpp
+++ b/radiant/pluginentities.cpp
@@ -28,7 +28,7 @@
 #ifdef USEPLUGINENTITIES
 
 #include "stdafx.h"
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <dirent.h>
 #endif
 //#include "qe3.h"
diff --git a/radiant/pluginmanager.cpp b/radiant/pluginmanager.cpp
index 79579082..eb5abe34 100644
--- a/radiant/pluginmanager.cpp
+++ b/radiant/pluginmanager.cpp
@@ -24,7 +24,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <dirent.h>
   #include <sys/time.h>
 #endif
@@ -1898,7 +1898,7 @@ void CPlugInManager::CommitPatchHandleToEntity( int index, patchMesh_t *pMesh, c
 
 #if 0
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
   #include <gdk/gdkx.h>
 
 XVisualInfo* QEX_ChooseVisual( bool zbuffer ){
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 4bb3c681..1823598f 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <assert.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -1321,7 +1321,7 @@ void CGameDialog::Init(){
 
 	// Add the per-user game path on all platforms
 	if ( m_pCurrentGameDescription->mUserPathPrefix.GetLength() ) {
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		g_qeglobals.m_strHomeGame = g_get_home_dir();
 		g_qeglobals.m_strHomeGame += "/";
 		g_qeglobals.m_strHomeGame += m_pCurrentGameDescription->mUserPathPrefix.GetBuffer();
@@ -3722,7 +3722,7 @@ void CGameInstall::Run() {
 		break;
 	}
 	case GAME_QUETOO: {
-#if defined( __APPLE__ ) || defined( __linux__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		fprintf( fg, "  " ENGINE_ATTRIBUTE "=\"quetoo\"\n" );
 		fprintf( fg, "  " PREFIX_ATTRIBUTE "=\".quetoo\"\n" );
 #elif _WIN32
diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index 07f3fa93..a2dbcb8f 100644
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include "gtkmisc.h"
 #include <glib/gi18n.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #include <X11/keysym.h>
 #include <gdk/gdkx.h>
@@ -171,7 +171,7 @@ void Map_Snapshot(){
 		bGo = ( _mkdir( strOrgPath ) != -1 );
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		bGo = ( mkdir( strOrgPath,0755 ) != -1 );
 #endif
 	}
@@ -288,7 +288,7 @@ int BuildShortPathName( const char* pPath, char* pBuffer, int nBufferLen ){
 }
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 int BuildShortPathName( const char* pPath, char* pBuffer, int nBufferLen ){
 	// remove /../ from directories
 	const char *scr = pPath; char *dst = pBuffer;
@@ -1208,7 +1208,7 @@ bool Sys_AltDown(){
 	return ( GetKeyState( VK_MENU ) & 0x8000 ) != 0;
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	char keys[32];
 	int x;
 
@@ -1244,7 +1244,7 @@ bool Sys_ShiftDown(){
 	return ( GetKeyState( VK_SHIFT ) & 0x8000 ) != 0;
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	char keys[32];
 	int x;
 
@@ -1329,7 +1329,7 @@ void Sys_SetCursorPos( int x, int y ){
 }
 
 void Sys_Beep( void ){
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	gdk_beep();
 #else
 	MessageBeep( MB_ICONASTERISK );
@@ -1702,7 +1702,7 @@ void Sys_LogFile( void ){
 		Str name;
 		name = g_strTempPath;
 		name += "radiant.log";
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		g_qeglobals.hLogFile = open( name.GetBuffer(), O_TRUNC | O_CREAT | O_WRONLY, S_IREAD | S_IWRITE );
 #endif
 #ifdef _WIN32
@@ -1729,7 +1729,7 @@ void Sys_LogFile( void ){
 		#ifdef _WIN32
 		_close( g_qeglobals.hLogFile );
 		#endif
-		#if defined ( __linux__ ) || defined ( __APPLE__ )
+		#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		close( g_qeglobals.hLogFile );
 		#endif
 		g_qeglobals.hLogFile = 0;
@@ -1757,7 +1757,7 @@ extern "C" void Sys_FPrintf_VA( int level, const char *text, va_list args ) {
 		_write( g_qeglobals.hLogFile, buf, length );
 		_commit( g_qeglobals.hLogFile );
 #endif
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		write( g_qeglobals.hLogFile, buf, length );
 #endif
 	}
diff --git a/radiant/qgl.c b/radiant/qgl.c
index cc502621..7a4f4657 100644
--- a/radiant/qgl.c
+++ b/radiant/qgl.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <float.h>
 #include <string.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <dlfcn.h>
 #endif
 
@@ -88,7 +88,7 @@ BOOL ( WINAPI * qwglSwapIntervalEXT )( int interval );
 #define WINAPI
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 void* g_hGLDLL;
 
 XVisualInfo* ( *qglXChooseVisual )( Display * dpy, int screen, int *attribList );
@@ -525,7 +525,7 @@ void QGL_Shutdown(){
 		FreeLibrary( g_hGLDLL );
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 		dlclose( g_hGLDLL );
 #endif
 
@@ -936,7 +936,7 @@ void QGL_Shutdown(){
 	qwglSetDeviceGammaRampEXT    = NULL;
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	qglXChooseVisual             = NULL;
 	qglXCreateContext            = NULL;
 	qglXDestroyContext           = NULL;
@@ -986,7 +986,7 @@ static void* safe_dlsym( void *handle, char *symbol ){
 	return GetProcAddress( handle, symbol );
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	void* ret = dlsym( handle, symbol );
 	const char *err = dlerror();
 	if ( err ) {
@@ -1174,7 +1174,7 @@ int QGL_Init( const char *dllname, const char* gluname ){
 	g_hGLDLL = LoadLibrary( dllname );
 #endif
 
-#if defined ( __linux__ ) || ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	const char *err;
 
 	// NOTE TTimo
@@ -1623,7 +1623,7 @@ int QGL_Init( const char *dllname, const char* gluname ){
 	qglMTexCoord2fSGIS = 0;
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	qglXChooseVisual             = safe_dlsym( g_hGLDLL, "glXChooseVisual" );
 	qglXCreateContext            = safe_dlsym( g_hGLDLL, "glXCreateContext" );
 	qglXDestroyContext           = safe_dlsym( g_hGLDLL, "glXDestroyContext" );
@@ -1704,7 +1704,7 @@ int GL_ExtensionSupported( const char *extension ){
 }
 
 void* Sys_GLGetExtension( const char *symbol ){
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	if ( qglXGetProcAddressARB == NULL ) {
 		return NULL;
 	}
diff --git a/radiant/qgl.h b/radiant/qgl.h
index 49fcfabb..ac3dfe72 100644
--- a/radiant/qgl.h
+++ b/radiant/qgl.h
@@ -30,7 +30,7 @@
 
 #include <GL/gl.h>
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <GL/glx.h>
 #endif
 
@@ -521,7 +521,7 @@ extern BOOL ( WINAPI * qwglSetDeviceGammaRampEXT )( const unsigned char *pRed, c
 
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 extern XVisualInfo* ( *qglXChooseVisual )( Display * dpy, int screen, int *attribList );
 extern GLXContext ( *qglXCreateContext )( Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct );
 extern void ( *qglXDestroyContext )( Display *dpy, GLXContext ctx );
diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index d91842a7..ab1ec3e2 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -32,7 +32,7 @@
    - Make sure the interface is not dependent on gtk.
  */
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <dirent.h>
 #endif
 #include <gtk/gtk.h>
diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index 3ebc99e8..569d3070 100644
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -41,7 +41,7 @@
 #include <winsock2.h>
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <sys/time.h>
 #define SOCKET_ERROR -1
 #endif
@@ -421,7 +421,7 @@ void CWatchBSP::RoutineProcessing(){
 #ifdef _WIN32
 	TIMEVAL tout = { 0, 0 };
 #endif
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	timeval tout;
 	tout.tv_sec = 0;
 	tout.tv_usec = 0;
diff --git a/tools/quake2/common/cmdlib.c b/tools/quake2/common/cmdlib.c
index 34286363..ef867a50 100644
--- a/tools/quake2/common/cmdlib.c
+++ b/tools/quake2/common/cmdlib.c
@@ -32,7 +32,7 @@
 #include <windows.h>
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #endif
 
@@ -1180,7 +1180,7 @@ void Sys_Sleep( int n ){
 #ifdef WIN32
 	Sleep( n );
 #endif
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	usleep( n * 1000 );
 #endif
 }
diff --git a/tools/quake2/common/path_init.c b/tools/quake2/common/path_init.c
index 2be96cbb..d448c5cc 100644
--- a/tools/quake2/common/path_init.c
+++ b/tools/quake2/common/path_init.c
@@ -28,7 +28,7 @@
 /* marker */
 #define PATH_INIT_C
 
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	#define Q_UNIX
 #endif
 
diff --git a/tools/quake2/common/threads.c b/tools/quake2/common/threads.c
index 98dd86b5..f8b51150 100644
--- a/tools/quake2/common/threads.c
+++ b/tools/quake2/common/threads.c
@@ -415,7 +415,7 @@ void RunThreadsOn( int workcnt, qboolean showpacifier, void ( *func )( int ) ){
    =======================================================================
  */
 
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #define USED
 
 // Setting default Threads to 1
diff --git a/tools/quake2/q2map/q2map.h b/tools/quake2/q2map/q2map.h
index 0b262093..a21791bb 100644
--- a/tools/quake2/q2map/q2map.h
+++ b/tools/quake2/q2map/q2map.h
@@ -21,7 +21,7 @@
 // q2map.h
 
 /* platform-specific */
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	#define Q_UNIX
 #endif
 
diff --git a/tools/quake2/qdata_heretic2/common/cmdlib.c b/tools/quake2/qdata_heretic2/common/cmdlib.c
index a9980168..387a4abd 100644
--- a/tools/quake2/qdata_heretic2/common/cmdlib.c
+++ b/tools/quake2/qdata_heretic2/common/cmdlib.c
@@ -32,7 +32,7 @@
 #include <windows.h>
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #endif
 
@@ -84,7 +84,7 @@ void *SafeMalloc( size_t n, char *desc ){
 	return p;
 }
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 void strlwr( char *conv_str ){
 	int i;
 
@@ -1192,7 +1192,7 @@ void Sys_Sleep( int n ){
 #ifdef WIN32
 	Sleep( n );
 #endif
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	usleep( n * 1000 );
 #endif
 }
diff --git a/tools/quake2/qdata_heretic2/common/path_init.c b/tools/quake2/qdata_heretic2/common/path_init.c
index 22674160..bbe4f0be 100644
--- a/tools/quake2/qdata_heretic2/common/path_init.c
+++ b/tools/quake2/qdata_heretic2/common/path_init.c
@@ -29,7 +29,7 @@
 /* marker */
 #define PATH_INIT_C
 
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	#define Q_UNIX
 #endif
 
diff --git a/tools/quake3/common/aselib.c b/tools/quake3/common/aselib.c
index ef1ecac0..b93ea81d 100644
--- a/tools/quake3/common/aselib.c
+++ b/tools/quake3/common/aselib.c
@@ -114,7 +114,7 @@ static char gl_filename[1024];
 static void ASE_Process( void );
 static void ASE_FreeGeomObject( int ndx );
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 
 static char* strlwr( char* string ){
 	char *cp;
diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.c
index 94c260d3..dd8c21b3 100644
--- a/tools/quake3/common/cmdlib.c
+++ b/tools/quake3/common/cmdlib.c
@@ -39,7 +39,7 @@
 #include <windows.h>
 #endif
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <unistd.h>
 #endif
 
@@ -1081,7 +1081,7 @@ void Sys_Sleep( int n ){
 #ifdef WIN32
 	Sleep( n );
 #endif
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	usleep( n * 1000 );
 #endif
 }
diff --git a/tools/quake3/common/trilib.c b/tools/quake3/common/trilib.c
index 67714768..b7002b8b 100644
--- a/tools/quake3/common/trilib.c
+++ b/tools/quake3/common/trilib.c
@@ -38,7 +38,7 @@
 
 //#define NOISY 1
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #define strlwr strlower
 #endif
 
diff --git a/tools/quake3/common/vfs.c b/tools/quake3/common/vfs.c
index 254babbe..bbe536bc 100644
--- a/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@ -43,7 +43,7 @@
 
 #include <stdio.h>
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #include <dirent.h>
 #include <unistd.h>
 #else
diff --git a/tools/quake3/q3data/md3lib.c b/tools/quake3/q3data/md3lib.c
index 1e25ae62..d24de620 100644
--- a/tools/quake3/q3data/md3lib.c
+++ b/tools/quake3/q3data/md3lib.c
@@ -25,7 +25,7 @@
 #endif
 #include "md3lib.h"
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #define filelength Q_filelength
 #endif
 
diff --git a/tools/quake3/q3data/p3dlib.c b/tools/quake3/q3data/p3dlib.c
index ea3ba749..d71f1396 100644
--- a/tools/quake3/q3data/p3dlib.c
+++ b/tools/quake3/q3data/p3dlib.c
@@ -31,7 +31,7 @@
 
 #define MAX_POLYSETS 64
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #define _strcmpi Q_stricmp
 #define filelength Q_filelength
 #define strlwr strlower
diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.c
index 50774834..066d2d0a 100644
--- a/tools/quake3/q3data/q3data.c
+++ b/tools/quake3/q3data/q3data.c
@@ -40,7 +40,7 @@ char *moddir = NULL;
 // some old defined that was in cmdlib lost during merge
 char writedir[1024];
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 #define strlwr strlower
 #endif
 
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index b92c8997..680d715f 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -57,7 +57,7 @@ extern int unz_GAME_QL;
    ------------------------------------------------------------------------------- */
 
 /* platform-specific */
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	#define Q_UNIX
 #endif
 
diff --git a/tools/urt/tools/quake3/q3map2/q3map2.h b/tools/urt/tools/quake3/q3map2/q3map2.h
index 8935ef2e..fbfa2669 100644
--- a/tools/urt/tools/quake3/q3map2/q3map2.h
+++ b/tools/urt/tools/quake3/q3map2/q3map2.h
@@ -47,7 +47,7 @@
    ------------------------------------------------------------------------------- */
 
 /* platform-specific */
-#if defined( __linux__ ) || defined( __APPLE__ )
+#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
 	#define Q_UNIX
 #endif