diff --git a/mozilla/include/npapi.h b/mozilla/include/npapi.h
index 6bb7b3055ed..1fc103f75ff 100644
--- a/mozilla/include/npapi.h
+++ b/mozilla/include/npapi.h
@@ -22,7 +22,7 @@
 
 
 /*
- *  npapi.h $Revision: 3.10 $
+ *  npapi.h $Revision: 3.11 $
  *  Netscape client plug-in API spec
  */
 
@@ -158,7 +158,7 @@ typedef unsigned long uint32;
 /*
  * AIX defines these in sys/inttypes.h included from sys/types.h
  */
-#if defined(_PR_AIX_HAVE_BSD_INT_TYPES)
+#ifndef AIX
 #ifndef _INT16
 typedef short int16;
 #endif
diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h
index 6bb7b3055ed..1fc103f75ff 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.10 $
+ *  npapi.h $Revision: 3.11 $
  *  Netscape client plug-in API spec
  */
 
@@ -158,7 +158,7 @@ typedef unsigned long uint32;
 /*
  * AIX defines these in sys/inttypes.h included from sys/types.h
  */
-#if defined(_PR_AIX_HAVE_BSD_INT_TYPES)
+#ifndef AIX
 #ifndef _INT16
 typedef short int16;
 #endif