--- webkit/glue/plugins/plugin_list.h
+++ webkit/glue/plugins/plugin_list.h
@@ -35,7 +35,7 @@ class PluginInstance;
 // This struct holds entry points into a plugin.  The entry points are
 // slightly different between Linux and other platforms.
 struct PluginEntryPoints {
-#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
+#if !defined(OS_NIX)
   NP_GetEntryPointsFunc np_getentrypoints;
 #endif
   NP_InitializeFunc np_initialize;
diff --git webkit/glue/plugins/test/plugin_javascript_open_popup.cc webkit/glue/plugins/test/plugin_javascript_open_popup.cc
index 558aa71..0d3f0c0 100644