diff --git a/config.h b/config.h
index 6745450d..90e95216 100644
--- a/config.h
+++ b/config.h
@@ -419,7 +419,9 @@
 #endif
 
 #include "config.package_name.in.h"
-#include "build_number.h"
+#if defined(FE_AQUA) || defined(FE_IOS)
+# include "build_number.h"
+#endif
 
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
@@ -454,7 +456,11 @@
 
 /* #undef USING_LINUX */
 
-#define XCHATLIBDIR get_appdir_fs()
+#if defined(FE_AQUA) || defined(FE_IOS)
+# define XCHATLIBDIR get_appdir_fs()
+#else
+# define XCHATLIBDIR "/tmp/local/lib/xchat"
+#endif
 
 #define XCHATSHAREDIR "${prefix}/share"
 
diff --git a/src/common/plugin.c b/src/common/plugin.c
index b535e1b7..7e7b7dd1 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -40,7 +40,7 @@ typedef struct session xchat_context;
 
 #include "xchatc.h"
 
-#ifdef __APPLE__
+#if defined(FE_AQUA) || defined(FE_IOS)
 extern char *get_appdir_fs();
 extern char *get_plugin_bundle_path(char *filename);
 #endif
@@ -381,7 +381,7 @@ plugin_load (session *sess, char *filename, char *arg)
 #define RTLD_NOW 0
 #endif
     
-#ifdef __APPLE__
+#if defined(FE_AQUA) || defined(FE_IOS)
     size_t filenamelen = strlen(filename);
     if (filenamelen > 7 && strcasecmp(".bundle", filename + filenamelen - 7) == 0) {
         filename = get_plugin_bundle_path(filename);