diff --git a/mozilla/include/npapi.h b/mozilla/include/npapi.h
index a646480db4e..17b3d807cdd 100644
--- a/mozilla/include/npapi.h
+++ b/mozilla/include/npapi.h
@@ -22,7 +22,7 @@
 
 
 /*
- *  npapi.h $Revision: 3.7 $
+ *  npapi.h $Revision: 3.8 $
  *  Netscape client plug-in API spec
  */
 
@@ -33,6 +33,13 @@
 #pragma pack(1)
 #endif
 
+/* 
+ * NO_NSPR_10_SUPPORT disables the inclusion 
+ * of obsolete/protypes.h, whose int16, uint16, 
+ * int32, and uint32 typedefs conflict with those 
+ * in this file. 
+ */ 
+#define NO_NSPR_10_SUPPORT
 #include "jri.h"                /* Java Runtime Interface */
 
 #if defined (__OS2__ ) || defined (OS2)
diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h
index a646480db4e..17b3d807cdd 100644
--- a/mozilla/modules/plugin/base/public/npapi.h
+++ b/mozilla/modules/plugin/base/public/npapi.h
@@ -22,7 +22,7 @@
 
 
 /*
- *  npapi.h $Revision: 3.7 $
+ *  npapi.h $Revision: 3.8 $
  *  Netscape client plug-in API spec
  */
 
@@ -33,6 +33,13 @@
 #pragma pack(1)
 #endif
 
+/* 
+ * NO_NSPR_10_SUPPORT disables the inclusion 
+ * of obsolete/protypes.h, whose int16, uint16, 
+ * int32, and uint32 typedefs conflict with those 
+ * in this file. 
+ */ 
+#define NO_NSPR_10_SUPPORT
 #include "jri.h"                /* Java Runtime Interface */
 
 #if defined (__OS2__ ) || defined (OS2)
diff --git a/mozilla/modules/plugin/default/unix/npshell.c b/mozilla/modules/plugin/default/unix/npshell.c
index 0bd2034a613..494769b8a32 100644
--- a/mozilla/modules/plugin/default/unix/npshell.c
+++ b/mozilla/modules/plugin/default/unix/npshell.c
@@ -39,14 +39,6 @@
  *
  */
 
-
-/* need to define these in order to avoid conflict with those 
-   defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
-#define _UINT16
-#define _UINT32
-#define _INT16
-#define _INT32
-
 #include <stdio.h>
 #include <string.h>
 #include "npapi.h"
diff --git a/mozilla/modules/plugin/default/unix/npunix.c b/mozilla/modules/plugin/default/unix/npunix.c
index 4f71d893d48..2f6d2e57823 100644
--- a/mozilla/modules/plugin/default/unix/npunix.c
+++ b/mozilla/modules/plugin/default/unix/npunix.c
@@ -37,13 +37,6 @@
 
 #define XP_UNIX 1
 
-/* need to define these in order to avoid conflict with those 
-   defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
-#define _UINT16
-#define _UINT32
-#define _INT16
-#define _INT32
-
 #include <stdio.h>
 #include "npapi.h"
 #include "npupp.h"
diff --git a/mozilla/modules/plugin/default/unix/nullplugin.c b/mozilla/modules/plugin/default/unix/nullplugin.c
index 8dd9e11ebe3..c5477891e7b 100644
--- a/mozilla/modules/plugin/default/unix/nullplugin.c
+++ b/mozilla/modules/plugin/default/unix/nullplugin.c
@@ -32,14 +32,6 @@
  *
  */
 
-
-/* need to define these in order to avoid conflict with those 
-   defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
-#define _UINT16
-#define _UINT32
-#define _INT16
-#define _INT32
-
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include "npapi.h"
diff --git a/mozilla/modules/plugin/samples/default/unix/npshell.c b/mozilla/modules/plugin/samples/default/unix/npshell.c
index 0bd2034a613..494769b8a32 100644
--- a/mozilla/modules/plugin/samples/default/unix/npshell.c
+++ b/mozilla/modules/plugin/samples/default/unix/npshell.c
@@ -39,14 +39,6 @@
  *
  */
 
-
-/* need to define these in order to avoid conflict with those 
-   defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
-#define _UINT16
-#define _UINT32
-#define _INT16
-#define _INT32
-
 #include <stdio.h>
 #include <string.h>
 #include "npapi.h"
diff --git a/mozilla/modules/plugin/samples/default/unix/npunix.c b/mozilla/modules/plugin/samples/default/unix/npunix.c
index 4f71d893d48..2f6d2e57823 100644
--- a/mozilla/modules/plugin/samples/default/unix/npunix.c
+++ b/mozilla/modules/plugin/samples/default/unix/npunix.c
@@ -37,13 +37,6 @@
 
 #define XP_UNIX 1
 
-/* need to define these in order to avoid conflict with those 
-   defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
-#define _UINT16
-#define _UINT32
-#define _INT16
-#define _INT32
-
 #include <stdio.h>
 #include "npapi.h"
 #include "npupp.h"
diff --git a/mozilla/modules/plugin/samples/default/unix/nullplugin.c b/mozilla/modules/plugin/samples/default/unix/nullplugin.c
index 8dd9e11ebe3..c5477891e7b 100644
--- a/mozilla/modules/plugin/samples/default/unix/nullplugin.c
+++ b/mozilla/modules/plugin/samples/default/unix/nullplugin.c
@@ -32,14 +32,6 @@
  *
  */
 
-
-/* need to define these in order to avoid conflict with those 
-   defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
-#define _UINT16
-#define _UINT32
-#define _INT16
-#define _INT32
-
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include "npapi.h"