2 files changed, 12 insertions, 12 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b4bb3929f285..1e038f8c284b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -934,7 +934,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 
-#ifndef WITHOUT_MOZILLA
+#if defined ENABLE_NSPLUGIN
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index eaf929478a1f..b73224858ae2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -103,6 +103,7 @@ File gid_File_Basic_Tutorials
 End
 
 #ifdef ENABLE_NSPLUGIN
+
 File gid_File_Exe_Nsplugin
         BIN_FILE_BODY;
         Styles          = (PACKED);
@@ -113,8 +114,18 @@ File gid_File_Exe_Nsplugin
     Name = "nsplugin.exe";
   #endif
 End
+
+#if defined(UNX) && !defined(QUARTZ)
+File gid_File_Bin_Pluginapp
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = "pluginapp.bin";
+    Styles = (PACKED);
+End
 #endif
 
+#endif // ENABLE_NSPLUGIN
+
 File gid_File_Bin_Gengal
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -148,17 +159,6 @@ End
 
 #endif
 
-#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Bin_Pluginapp
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "pluginapp.bin";
-    Styles = (PACKED);
-End
-
-#endif
-
 #ifdef UNX
 
 File gid_File_Bin_Open_Url