diff --git a/direct/src/plugin_npapi/nppanda3d_common.h b/direct/src/plugin_npapi/nppanda3d_common.h
index 4ce39a72d8..ffb89605c4 100644
--- a/direct/src/plugin_npapi/nppanda3d_common.h
+++ b/direct/src/plugin_npapi/nppanda3d_common.h
@@ -46,11 +46,15 @@ extern ofstream logfile;
 
 #include <windows.h>
 
-#else defined(__APPLE__)
+#elif defined(__APPLE__)
 
 // On Mac, Gecko requires this symbol to be defined.
 #define XP_MACOSX
 
+#else
+
+#define XP_UNIX
+
 #endif  // _WIN32, __APPLE__
 
 #include "npapi.h"
diff --git a/direct/src/plugin_npapi/ppInstance.cxx b/direct/src/plugin_npapi/ppInstance.cxx
index 946d80b69e..8392825587 100644
--- a/direct/src/plugin_npapi/ppInstance.cxx
+++ b/direct/src/plugin_npapi/ppInstance.cxx
@@ -16,6 +16,8 @@
 #include "startup.h"
 #include "p3d_plugin_config.h"
 
+#include <string.h>
+
 ////////////////////////////////////////////////////////////////////
 //     Function: PPInstance::Constructor
 //       Access: Public