diff --git a/accessible/src/base/ARIAStateMap.h b/accessible/src/base/ARIAStateMap.h
index 16b8d93d338f..57014073fddc 100644
--- a/accessible/src/base/ARIAStateMap.h
+++ b/accessible/src/base/ARIAStateMap.h
@@ -7,7 +7,7 @@
 #ifndef _mozilla_a11y_aria_ARIAStateMap_h_
 #define _mozilla_a11y_aria_ARIAStateMap_h_
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 namespace mozilla {
 
diff --git a/accessible/src/base/States.h b/accessible/src/base/States.h
index 624423eac7bb..6232e8ff1cef 100644
--- a/accessible/src/base/States.h
+++ b/accessible/src/base/States.h
@@ -7,7 +7,7 @@
 #ifndef _states_h_
 #define _states_h_
 
-#include <prtypes.h>
+#include "mozilla/StandardInteger.h"
 
 namespace mozilla {
 namespace a11y {
diff --git a/accessible/src/msaa/Compatibility.h b/accessible/src/msaa/Compatibility.h
index d258c2a32de5..697028b9d7ac 100644
--- a/accessible/src/msaa/Compatibility.h
+++ b/accessible/src/msaa/Compatibility.h
@@ -7,7 +7,7 @@
 #ifndef COMPATIBILITY_MANAGER_H
 #define COMPATIBILITY_MANAGER_H
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 class nsAccessNodeWrap;
 
diff --git a/content/base/src/nsAtomListUtils.h b/content/base/src/nsAtomListUtils.h
index 1276ceec301a..a43b0a1e38dd 100644
--- a/content/base/src/nsAtomListUtils.h
+++ b/content/base/src/nsAtomListUtils.h
@@ -10,7 +10,7 @@
 #ifndef nsAtomListUtils_h__
 #define nsAtomListUtils_h__
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 class nsIAtom;
 struct nsStaticAtom;
diff --git a/content/smil/nsSMILKeySpline.cpp b/content/smil/nsSMILKeySpline.cpp
index bd447baef785..f19d1a89fa0a 100644
--- a/content/smil/nsSMILKeySpline.cpp
+++ b/content/smil/nsSMILKeySpline.cpp
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsSMILKeySpline.h"
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 #include <math.h>
 
 #define NEWTON_ITERATIONS          4
diff --git a/content/smil/nsSMILTypes.h b/content/smil/nsSMILTypes.h
index 012b287ad9e8..b8ba05f40d04 100644
--- a/content/smil/nsSMILTypes.h
+++ b/content/smil/nsSMILTypes.h
@@ -6,7 +6,7 @@
 #ifndef NS_SMILTYPES_H_
 #define NS_SMILTYPES_H_
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 // A timestamp in milliseconds
 //
diff --git a/dom/plugins/test/testplugin/nptest.h b/dom/plugins/test/testplugin/nptest.h
index 5cb19b7dee5d..1d28c6ac1aa1 100644
--- a/dom/plugins/test/testplugin/nptest.h
+++ b/dom/plugins/test/testplugin/nptest.h
@@ -40,6 +40,7 @@
 #include "npfunctions.h"
 #include "npruntime.h"
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 #include <string>
 #include <sstream>
 
diff --git a/gfx/qcms/qcmstypes.h b/gfx/qcms/qcmstypes.h
index 5acb21b8f006..9bacf8799ac6 100644
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@@ -4,6 +4,7 @@
 #ifdef MOZ_QCMS
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
 
diff --git a/gfx/ycbcr/chromium_types.h b/gfx/ycbcr/chromium_types.h
index efa624b5ff14..96410a8d66bb 100644
--- a/gfx/ycbcr/chromium_types.h
+++ b/gfx/ycbcr/chromium_types.h
@@ -6,6 +6,7 @@
 #define GFX_CHROMIUMTYPES_H
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 typedef uint8_t uint8;
 typedef int8_t int8;
diff --git a/intl/uconv/util/ubase.h b/intl/uconv/util/ubase.h
index 7ad045033a65..b32add723bbb 100644
--- a/intl/uconv/util/ubase.h
+++ b/intl/uconv/util/ubase.h
@@ -6,6 +6,7 @@
 #define ubase_h__
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 #define PRIVATE 
 #define MODULE_PRIVATE
diff --git a/intl/unicharutil/util/nsSpecialCasingData.h b/intl/unicharutil/util/nsSpecialCasingData.h
index 377c5ba42ac9..6fc87000a50a 100644
--- a/intl/unicharutil/util/nsSpecialCasingData.h
+++ b/intl/unicharutil/util/nsSpecialCasingData.h
@@ -3,6 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 namespace mozilla {
 namespace unicode {
diff --git a/layout/base/nsFrameIterator.h b/layout/base/nsFrameIterator.h
index 3dc7a42372f0..3169b8dbd007 100644
--- a/layout/base/nsFrameIterator.h
+++ b/layout/base/nsFrameIterator.h
@@ -5,7 +5,7 @@
 #ifndef NSFRAMEITERATOR_H
 #define NSFRAMEITERATOR_H
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 class nsPresContext;
 class nsIFrame;
diff --git a/media/libjpeg/jmorecfg.h b/media/libjpeg/jmorecfg.h
index e2611de5848f..0c9c1b889420 100644
--- a/media/libjpeg/jmorecfg.h
+++ b/media/libjpeg/jmorecfg.h
@@ -12,6 +12,7 @@
  */
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /*
  * Define BITS_IN_JSAMPLE as either
diff --git a/modules/libmar/sign/nss_secutil.h b/modules/libmar/sign/nss_secutil.h
index 1c8db2d3238c..51a33f5893fe 100644
--- a/modules/libmar/sign/nss_secutil.h
+++ b/modules/libmar/sign/nss_secutil.h
@@ -14,6 +14,7 @@
 #include "hasht.h"
 #include "cert.h"
 #include "key.h"
+#include "mozilla/StandardInteger.h"
 
 typedef struct {
   enum {
diff --git a/modules/libmar/src/mar.h b/modules/libmar/src/mar.h
index 48dca08b1775..11776f05e29e 100644
--- a/modules/libmar/src/mar.h
+++ b/modules/libmar/src/mar.h
@@ -9,6 +9,7 @@
 
 /* We use NSPR here just to import the definition of uint32_t */
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/modules/libmar/src/mar_private.h b/modules/libmar/src/mar_private.h
index 2455a7c39c9d..970dc51a8513 100644
--- a/modules/libmar/src/mar_private.h
+++ b/modules/libmar/src/mar_private.h
@@ -9,6 +9,7 @@
 
 #include "prtypes.h"
 #include "limits.h"
+#include "mozilla/StandardInteger.h"
 
 /* Code in this module requires a guarantee that the size
    of uint32_t and uint64_t are 4 and 8 bytes respectively. */
diff --git a/netwerk/dns/nsIDNKitInterface.h b/netwerk/dns/nsIDNKitInterface.h
index cb7cb100fbab..5b9f97242afd 100644
--- a/netwerk/dns/nsIDNKitInterface.h
+++ b/netwerk/dns/nsIDNKitInterface.h
@@ -47,7 +47,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /*
  * libidnkit result code.
diff --git a/other-licenses/snappy/snappy-stubs-public.h b/other-licenses/snappy/snappy-stubs-public.h
index b8a2b7c6a9fa..ef12b974fc3d 100644
--- a/other-licenses/snappy/snappy-stubs-public.h
+++ b/other-licenses/snappy/snappy-stubs-public.h
@@ -36,7 +36,7 @@
 #ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 #define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 #define SNAPPY_MAJOR 1
 #define SNAPPY_MINOR 0
diff --git a/security/manager/ssl/src/md4.h b/security/manager/ssl/src/md4.h
index 08e89eb462de..695515e4bba3 100644
--- a/security/manager/ssl/src/md4.h
+++ b/security/manager/ssl/src/md4.h
@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /**
  * md4sum - computes the MD4 sum over the input buffer per RFC 1320
diff --git a/toolkit/mozapps/update/updater/bspatch.h b/toolkit/mozapps/update/updater/bspatch.h
index f99b65f06ac6..1cdbe47774a9 100644
--- a/toolkit/mozapps/update/updater/bspatch.h
+++ b/toolkit/mozapps/update/updater/bspatch.h
@@ -32,8 +32,7 @@
 #ifndef bspatch_h__
 #define bspatch_h__
 
-// We use the NSPR types, but we don't link with NSPR
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 #include <stdio.h>
 
 typedef struct MBSPatchHeader_ {
diff --git a/widget/nsEvent.h b/widget/nsEvent.h
index c43aadcd8711..606a645b5171 100644
--- a/widget/nsEvent.h
+++ b/widget/nsEvent.h
@@ -6,6 +6,8 @@
 #ifndef nsEvent_h__
 #define nsEvent_h__
 
+#include "mozilla/StandardInteger.h"
+
 /*
  * This is in a separate header file because it needs to be included
  * in many places where including nsGUIEvent.h would bring in many
diff --git a/xpcom/typelib/xpt/public/xpt_arena.h b/xpcom/typelib/xpt/public/xpt_arena.h
index abd1fb1a3cf9..8c812a5a2bd1 100644
--- a/xpcom/typelib/xpt/public/xpt_arena.h
+++ b/xpcom/typelib/xpt/public/xpt_arena.h
@@ -12,6 +12,7 @@
 
 #include "prtypes.h"
 #include <stdlib.h>
+#include "mozilla/StandardInteger.h"
 
 
 /*
diff --git a/xpcom/typelib/xpt/public/xpt_struct.h b/xpcom/typelib/xpt/public/xpt_struct.h
index 6621dcc22af1..3fd5baf613ce 100644
--- a/xpcom/typelib/xpt/public/xpt_struct.h
+++ b/xpcom/typelib/xpt/public/xpt_struct.h
@@ -12,6 +12,7 @@
 #define __xpt_struct_h__
 
 #include "xpt_arena.h"
+#include "mozilla/StandardInteger.h"
 
 PR_BEGIN_EXTERN_C