Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 30 Jul 2013 10:25:31 -0400
changeset 140562 95fda0cdd9da6a6ce4dba2a09d00406896958e00
parent 140561 e399386dac6bf071a1c7ac592118f79608db5b5b
child 140563 660daeb570ae2b642c45cf690d10dacf5fce8bf4
push id1974
push userryanvm@gmail.com
push dateWed, 31 Jul 2013 01:32:25 +0000
treeherderfx-team@46668a08f3e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo, ted
bugs872127
milestone25.0a1
Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted
accessible/src/base/ARIAStateMap.h
accessible/src/base/Filters.h
accessible/src/base/States.h
accessible/src/generic/TableCellAccessible.h
accessible/src/windows/msaa/Compatibility.h
caps/include/nsScriptSecurityManager.h
caps/src/nsScriptSecurityManager.cpp
configure.in
content/base/public/nsDOMFile.h
content/base/public/nsViewportInfo.h
content/base/src/nsAtomListUtils.h
content/base/src/nsAttrValueInlines.h
content/base/src/nsContentListDeclarations.h
content/base/src/nsTextFragmentImpl.h
content/canvas/src/ImageData.h
content/canvas/src/WebGLElementArrayCache.h
content/canvas/src/WebGLTexelConversions.h
content/media/MediaDecoderReader.cpp
content/media/MediaDecoderStateMachine.cpp
content/media/VideoUtils.cpp
content/media/ogg/OggCodecState.cpp
content/media/ogg/OggCodecState.h
content/media/wave/WaveReader.cpp
content/media/webm/WebMReader.h
content/media/wmf/WMFUtils.cpp
content/smil/nsSMILKeySpline.cpp
content/smil/nsSMILTypes.h
content/svg/content/src/SVGSVGElement.cpp
content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
dom/base/nsDOMWindowList.h
dom/gamepad/Gamepad.h
dom/gamepad/GamepadService.h
dom/plugins/base/nsNPAPIPluginStreamListener.cpp
dom/plugins/ipc/PluginInstanceParent.cpp
dom/plugins/test/testplugin/nptest.h
dom/system/gonk/AutoMounter.h
dom/workers/Workers.h
gfx/2d/Types.h
gfx/gl/GLContext.h
gfx/gl/GLContextUtils.cpp
gfx/gl/GLDefs.h
gfx/gl/SharedSurface.h
gfx/gl/SurfaceTypes.h
gfx/layers/ImageDataSerializer.h
gfx/layers/client/TextureClient.cpp
gfx/layers/ipc/CompositableForwarder.h
gfx/qcms/qcmstypes.h
gfx/thebes/gfxScriptItemizer.h
gfx/ycbcr/chromium_types.h
image/src/ImageMetadata.h
image/src/RasterImage.cpp
intl/uconv/tools/umaptable.c
intl/uconv/util/ubase.h
intl/unicharutil/tools/genUnicodePropertyData.pl
intl/unicharutil/util/nsSpecialCasingData.h
intl/unicharutil/util/nsUnicodePropertyData.cpp
ipc/chromium/src/base/basictypes.h
ipc/glue/IPCMessageUtils.h
js/src/ctypes/CTypes.cpp
js/src/gc/Heap.h
js/src/ion/arm/Architecture-arm.cpp
js/src/ion/arm/Architecture-arm.h
js/src/ion/shared/IonFrames-x86-shared.h
js/src/jsapi.h
js/src/jscrashreport.h
js/src/jsfriendapi.cpp
js/src/prmjtime.h
js/src/vm/DateTime.h
js/src/vm/ObjectImpl.h
js/src/vm/ThreadPool.h
js/src/yarr/CheckedArithmetic.h
js/src/yarr/PageBlock.h
js/src/yarr/YarrCanonicalizeUCS2.h
js/xpconnect/src/XPCWrappedNative.cpp
js/xpconnect/src/xpcObjectHelper.h
js/xpconnect/src/xpcprivate.h
layout/base/nsDisplayList.cpp
layout/base/nsDisplayList.h
layout/base/nsPresArena.h
layout/generic/nsGfxScrollFrame.cpp
layout/style/nsRuleData.cpp
layout/style/nsRuleNode.h
layout/tables/celldata.h
media/libcubeb/include/cubeb-stdint.h
media/libjpeg/jmorecfg.h
media/libjpeg/mozilla.diff
media/mtransport/objs.mk
media/mtransport/third_party/nICEr/nicer.gyp
media/mtransport/third_party/nrappkit/nrappkit.gyp
media/webrtc/signaling/signaling.gyp
media/webrtc/trunk/third_party/libyuv/include/libyuv/basic_types.h
mfbt/BloomFilter.h
mfbt/CheckedInt.h
mfbt/Endian.h
mfbt/EnumSet.h
mfbt/FloatingPoint.h
mfbt/HashFunctions.h
mfbt/MathAlgorithms.h
mfbt/Poison.h
mfbt/SHA1.h
mfbt/StandardInteger.h
mfbt/Types.h
mfbt/decimal/Decimal.h
mfbt/decimal/to-moz-dependencies.patch
mfbt/double-conversion/use-StandardInteger.patch
mfbt/double-conversion/utils.h
mfbt/exported_headers.mk
mfbt/tests/TestCasting.cpp
modules/libmar/sign/nss_secutil.h
modules/libmar/src/mar.h
modules/libmar/src/mar_private.h
netwerk/base/src/DashboardTypes.h
netwerk/dns/nsIDNKitInterface.h
netwerk/sctp/datachannel/DataChannel.cpp
netwerk/srtp/src/Makefile.in
other-licenses/snappy/snappy-stubs-public.h
security/manager/boot/src/nsSTSPreloadList.inc
security/manager/ssl/src/md4.h
security/manager/tools/getHSTSPreloadList.js
toolkit/components/mediasniffer/mp3sniff.h
toolkit/mozapps/update/updater/bspatch.h
toolkit/xre/MacLaunchHelper.h
toolkit/xre/nsWindowsDllInterceptor.h
tools/profiler/GeckoProfilerFunc.h
tools/profiler/PseudoStack.h
tools/profiler/UnwinderThread2.cpp
tools/profiler/platform.h
tools/profiler/shared-libraries.h
tools/trace-malloc/lib/nsTraceMalloc.h
tools/trace-malloc/lib/nsTraceMallocCallbacks.h
tools/trace-malloc/spacetrace.h
widget/cocoa/nsCocoaFeatures.h
widget/nsEvent.h
xpcom/base/nsCycleCollector.cpp
xpcom/base/nsError.h
xpcom/base/nsStackWalk.h
xpcom/base/nscore.h
xpcom/build/nsXREAppData.h
xpcom/ds/nsCheapSets.h
xpcom/glue/nsTArrayForwardDeclare.h
xpcom/glue/nsVersionComparator.cpp
xpcom/glue/nsVoidArray.h
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp
xpcom/tests/TestPRIntN.cpp
xpcom/typelib/xpt/public/xpt_arena.h
xpcom/typelib/xpt/public/xpt_struct.h
--- a/accessible/src/base/ARIAStateMap.h
+++ b/accessible/src/base/ARIAStateMap.h
@@ -2,17 +2,17 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef _mozilla_a11y_aria_ARIAStateMap_h_
 #define _mozilla_a11y_aria_ARIAStateMap_h_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 namespace mozilla {
 
 namespace dom {
 class Element;
 }
 
 namespace a11y {
--- a/accessible/src/base/Filters.h
+++ b/accessible/src/base/Filters.h
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_a11y_Filters_h__
 #define mozilla_a11y_Filters_h__
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 /**
  * Predefined filters used for nsAccIterator and nsAccCollector.
  */
 namespace mozilla {
 namespace a11y {
 
 class Accessible;
--- a/accessible/src/base/States.h
+++ b/accessible/src/base/States.h
@@ -2,17 +2,17 @@
 /* vim: set expandtab shiftwidth=2 tabstop=2: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef _states_h_
 #define _states_h_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 namespace mozilla {
 namespace a11y {
 namespace states {
 
   /**
    * The object is disabled, opposite to enabled and sensitive.
    */
--- a/accessible/src/generic/TableCellAccessible.h
+++ b/accessible/src/generic/TableCellAccessible.h
@@ -3,17 +3,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_a11y_TableCellAccessible_h__
 #define mozilla_a11y_TableCellAccessible_h__
 
 #include "nsTArray.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 namespace mozilla {
 namespace a11y {
 
 class Accessible;
 class TableAccessible;
 
 /**
--- a/accessible/src/windows/msaa/Compatibility.h
+++ b/accessible/src/windows/msaa/Compatibility.h
@@ -2,17 +2,17 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef COMPATIBILITY_MANAGER_H
 #define COMPATIBILITY_MANAGER_H
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 namespace mozilla {
 namespace a11y {
 
 /**
  * Used to get compatibility modes. Note, modes are computed at accessibility
  * start up time and aren't changed during lifetime.
  */
--- a/caps/include/nsScriptSecurityManager.h
+++ b/caps/include/nsScriptSecurityManager.h
@@ -16,17 +16,17 @@
 #include "nsHashtable.h"
 #include "nsCOMPtr.h"
 #include "nsIChannelEventSink.h"
 #include "nsIObserver.h"
 #include "pldhash.h"
 #include "plstr.h"
 #include "nsIScriptExternalNameSet.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsIDocShell;
 class nsString;
 class nsIClassInfo;
 class nsIIOService;
 class nsIStringBundle;
 class nsSystemPrincipal;
 struct ClassPolicy;
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -52,17 +52,17 @@
 #include "nsIClassInfo.h"
 #include "nsIURIFixup.h"
 #include "nsCDefaultURIFixup.h"
 #include "nsIChromeRegistry.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BindingUtils.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
 
 // This should be probably defined on some other place... but I couldn't find it
 #define WEBAPPS_PERM_NAME "webapps-manage"
 
--- a/configure.in
+++ b/configure.in
@@ -6053,17 +6053,16 @@ if test -n "$MOZ_CRASHREPORTER"; then
 
   if test "$OS_ARCH" = "WINNT"; then
     if test -z "$HAVE_64BIT_OS"; then
       MOZ_CRASHREPORTER_INJECTOR=1
       AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
     fi
   fi
 fi
-AC_DEFINE_UNQUOTED(BREAKPAD_CUSTOM_STDINT_H, "mozilla/StandardInteger.h")
 
 MOZ_ARG_WITH_STRING(crashreporter-enable-percent,
 [  --with-crashreporter-enable-percent=NN
                           Enable sending crash reports by default on NN% of users. (default=100)],
 [ val=`echo $withval | sed 's/[^0-9]//g'`
     MOZ_CRASHREPORTER_ENABLE_PERCENT="$val"])
 
 if test -z "$MOZ_CRASHREPORTER_ENABLE_PERCENT"; then
--- a/content/base/public/nsDOMFile.h
+++ b/content/base/public/nsDOMFile.h
@@ -19,17 +19,17 @@
 #include "nsString.h"
 #include "nsIXMLHttpRequest.h"
 #include "nsAutoPtr.h"
 #include "nsFileStreams.h"
 #include "nsTemporaryFileInputStream.h"
 
 #include "mozilla/GuardObjects.h"
 #include "mozilla/LinkedList.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/dom/DOMError.h"
 #include "mozilla/dom/indexedDB/FileInfo.h"
 #include "mozilla/dom/indexedDB/FileManager.h"
 #include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
--- a/content/base/public/nsViewportInfo.h
+++ b/content/base/public/nsViewportInfo.h
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsViewportInfo_h___
 #define nsViewportInfo_h___
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nscore.h"
 
 /**
  * Default values for the nsViewportInfo class.
  */
 static const double   kViewportMinScale = 0.0;
 static const double   kViewportMaxScale = 10.0;
 static const uint32_t kViewportMinWidth = 200;
--- a/content/base/src/nsAtomListUtils.h
+++ b/content/base/src/nsAtomListUtils.h
@@ -5,17 +5,17 @@
 
 /*
  * Static helper class for implementing atom lists.
  */
 
 #ifndef nsAtomListUtils_h__
 #define nsAtomListUtils_h__
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsIAtom;
 struct nsStaticAtom;
 
 class nsAtomListUtils {
 public:
     static bool IsMember(nsIAtom *aAtom,
                            const nsStaticAtom* aInfo,
--- a/content/base/src/nsAttrValueInlines.h
+++ b/content/base/src/nsAttrValueInlines.h
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsAttrValueInlines_h__
 #define nsAttrValueInlines_h__
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 struct MiscContainer
 {
   typedef nsAttrValue::ValueType ValueType;
 
   ValueType mType;
   // mStringBits points to either nsIAtom* or nsStringBuffer* and is used when
   // mType isn't mCSSStyleRule.
--- a/content/base/src/nsContentListDeclarations.h
+++ b/content/base/src/nsContentListDeclarations.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsContentListDeclarations_h
 #define nsContentListDeclarations_h
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsCOMPtr.h"
 #include "nsStringGlue.h"
 
 class nsContentList;
 class nsIAtom;
 class nsIContent;
 class nsINode;
 
--- a/content/base/src/nsTextFragmentImpl.h
+++ b/content/base/src/nsTextFragmentImpl.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsTextFragmentImpl_h__
 #define nsTextFragmentImpl_h__
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 template<size_t size> struct Non8BitParameters;
 template<> struct Non8BitParameters<4> {
   static inline size_t mask() { return 0xff00ff00; }
   static inline uint32_t alignMask() { return 0x3; }
   static inline uint32_t numUnicharsPerWord() { return 2; }
 };
 
--- a/content/canvas/src/ImageData.h
+++ b/content/canvas/src/ImageData.h
@@ -5,17 +5,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_ImageData_h
 #define mozilla_dom_ImageData_h
 
 #include "nsIDOMCanvasRenderingContext2D.h"
 
 #include "mozilla/Attributes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include "nsCycleCollectionParticipant.h"
 #include "nsTraceRefcnt.h"
 #include "xpcpublic.h"
 
 #include "jsapi.h"
 
 namespace mozilla {
--- a/content/canvas/src/WebGLElementArrayCache.h
+++ b/content/canvas/src/WebGLElementArrayCache.h
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef WEBGLELEMENTARRAYCACHE_H
 #define WEBGLELEMENTARRAYCACHE_H
 
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nscore.h"
 #include "GLDefs.h"
 
 namespace mozilla {
 
 template<typename T>
 struct WebGLElementArrayCacheTree;
 
--- a/content/canvas/src/WebGLTexelConversions.h
+++ b/content/canvas/src/WebGLTexelConversions.h
@@ -28,17 +28,17 @@
 #ifndef WEBGLTEXELCONVERSIONS_H_
 #define WEBGLTEXELCONVERSIONS_H_
 
 #ifdef __SUNPRO_CC
 #define __restrict
 #endif
 
 #include "WebGLTypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #if defined _MSC_VER
 #define FORCE_INLINE __forceinline
 #elif defined __GNUC__
 #define FORCE_INLINE __attribute__((always_inline)) inline
 #else
 #define FORCE_INLINE inline
 #endif
--- a/content/media/MediaDecoderReader.cpp
+++ b/content/media/MediaDecoderReader.cpp
@@ -7,17 +7,17 @@
 #include "GrallocImages.h"
 #include "MediaDecoderReader.h"
 #include "AbstractMediaDecoder.h"
 #include "MediaDecoderStateMachine.h"
 #include "VideoUtils.h"
 #include "ImageContainer.h"
 
 #include "mozilla/mozalloc.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>
 
 namespace mozilla {
 
 using layers::ImageContainer;
 using layers::PlanarYCbCrImage;
 
 // Verify these values are sane. Once we've checked the frame sizes, we then
--- a/content/media/MediaDecoderStateMachine.cpp
+++ b/content/media/MediaDecoderStateMachine.cpp
@@ -5,17 +5,17 @@
 
 #ifdef XP_WIN
 // Include Windows headers required for enabling high precision timers.
 #include "windows.h"
 #include "mmsystem.h"
 #endif
  
 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 
 #include "MediaDecoderStateMachine.h"
 #include <limits>
 #include "AudioStream.h"
 #include "nsTArray.h"
 #include "MediaDecoder.h"
 #include "MediaDecoderReader.h"
--- a/content/media/VideoUtils.cpp
+++ b/content/media/VideoUtils.cpp
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "VideoUtils.h"
 #include "MediaResource.h"
 #include "mozilla/dom/TimeRanges.h"
 #include "nsMathUtils.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // Converts from number of audio frames to microseconds, given the specified
 // audio rate.
 CheckedInt64 FramesToUsecs(int64_t aFrames, uint32_t aRate) {
   return (CheckedInt64(aFrames) * USECS_PER_S) / aRate;
 }
 
 // Converts from microseconds to number of audio frames, given the specified
--- a/content/media/ogg/OggCodecState.cpp
+++ b/content/media/ogg/OggCodecState.cpp
@@ -2,17 +2,17 @@
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <string.h>
 
 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include "nsDebug.h"
 #include "MediaDecoderReader.h"
 #include "OggCodecState.h"
 #include "OggDecoder.h"
 #include "nsTraceRefcnt.h"
 #include "VideoUtils.h"
 #include <algorithm>
--- a/content/media/ogg/OggCodecState.h
+++ b/content/media/ogg/OggCodecState.h
@@ -22,17 +22,17 @@
 #include "MediaDecoderReader.h"
 #endif
 #include <nsAutoRef.h>
 #include <nsDeque.h>
 #include <nsTArray.h>
 #include <nsClassHashtable.h>
 #include "VideoUtils.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // Uncomment the following to validate that we're predicting the number
 // of Vorbis samples in each packet correctly.
 #define VALIDATE_VORBIS_SAMPLE_CALCULATION
 #ifdef  VALIDATE_VORBIS_SAMPLE_CALCULATION
 #include <map>
 #endif
 
--- a/content/media/wave/WaveReader.cpp
+++ b/content/media/wave/WaveReader.cpp
@@ -6,17 +6,17 @@
 #include "nsError.h"
 #include "AbstractMediaDecoder.h"
 #include "MediaResource.h"
 #include "WaveReader.h"
 #include "mozilla/dom/TimeRanges.h"
 #include "MediaDecoderStateMachine.h"
 #include "VideoUtils.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/CheckedInt.h"
 #include <algorithm>
 
 namespace mozilla {
 
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
--- a/content/media/webm/WebMReader.h
+++ b/content/media/webm/WebMReader.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #if !defined(WebMReader_h_)
 #define WebMReader_h_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include "nsDeque.h"
 #include "MediaDecoderReader.h"
 #include "nsAutoRef.h"
 #include "nestegg/nestegg.h"
 
 #define VPX_DONT_DEFINE_STDINT_TYPES
 #include "vpx/vpx_codec.h"
--- a/content/media/wmf/WMFUtils.cpp
+++ b/content/media/wmf/WMFUtils.cpp
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WMFUtils.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/RefPtr.h"
 #include "prlog.h"
 #include "nsThreadUtils.h"
 #include "WinUtils.h"
 #include "nsWindowsHelpers.h"
 
 using namespace mozilla::widget;
 
--- a/content/smil/nsSMILKeySpline.cpp
+++ b/content/smil/nsSMILKeySpline.cpp
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsSMILKeySpline.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <math.h>
 
 #define NEWTON_ITERATIONS          4
 #define NEWTON_MIN_SLOPE           0.02
 #define SUBDIVISION_PRECISION      0.0000001
 #define SUBDIVISION_MAX_ITERATIONS 10
 
 const double nsSMILKeySpline::kSampleStepSize =
--- a/content/smil/nsSMILTypes.h
+++ b/content/smil/nsSMILTypes.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef NS_SMILTYPES_H_
 #define NS_SMILTYPES_H_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // A timestamp in milliseconds
 //
 // A time may represent:
 //
 //   simple time -- offset within the simple duration
 //   active time -- offset within the active duration
 //   document time -- offset since the document begin
--- a/content/svg/content/src/SVGSVGElement.cpp
+++ b/content/svg/content/src/SVGSVGElement.cpp
@@ -1,14 +1,14 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 
 #include "nsGkAtoms.h"
 #include "nsLayoutUtils.h"
 #include "DOMSVGNumber.h"
 #include "DOMSVGLength.h"
 #include "nsSVGAngle.h"
--- a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@@ -17,17 +17,17 @@
 #include "nsString.h"
 #include "nsTextFragment.h"
 #include "txXMLUtils.h"
 #include "txLog.h"
 #include "nsUnicharUtils.h"
 #include "nsAttrName.h"
 #include "nsTArray.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>
 
 const uint32_t kUnknownIndex = uint32_t(-1);
 
 txXPathTreeWalker::txXPathTreeWalker(const txXPathTreeWalker& aOther)
     : mPosition(aOther.mPosition),
       mCurrentIndex(aOther.mCurrentIndex)
 {
--- a/dom/base/nsDOMWindowList.h
+++ b/dom/base/nsDOMWindowList.h
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef nsDOMWindowList_h___
 #define nsDOMWindowList_h___
 
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsIDOMWindowCollection.h"
 #include "nsString.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsIDocShellTreeNode;
 class nsIDocShell;
 class nsIDOMWindow;
 
 class nsDOMWindowList : public nsIDOMWindowCollection
 {
 public:
--- a/dom/gamepad/Gamepad.h
+++ b/dom/gamepad/Gamepad.h
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_gamepad_Gamepad_h
 #define mozilla_dom_gamepad_Gamepad_h
 
 #include "mozilla/ErrorResult.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsCOMPtr.h"
 #include "nsIDOMGamepad.h"
 #include "nsIVariant.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
--- a/dom/gamepad/GamepadService.h
+++ b/dom/gamepad/GamepadService.h
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_GamepadService_h_
 #define mozilla_dom_GamepadService_h_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "Gamepad.h"
 #include "nsAutoPtr.h"
 #include "nsCOMArray.h"
 #include "nsIGamepadServiceTest.h"
 #include "nsGlobalWindow.h"
 #include "nsIFocusManager.h"
 #include "nsIObserver.h"
 #include "nsITimer.h"
--- a/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
+++ b/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
@@ -10,17 +10,17 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsIFile.h"
 #include "nsNetUtil.h"
 #include "nsPluginHost.h"
 #include "nsNPAPIPlugin.h"
 #include "nsPluginLogging.h"
 #include "nsPluginStreamListenerPeer.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>
 
 nsNPAPIStreamWrapper::nsNPAPIStreamWrapper(nsIOutputStream *outputStream,
                                            nsNPAPIPluginStreamListener *streamListener)
 {
   mOutputStream = outputStream;
   mStreamListener = streamListener;
 
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: sw=4 ts=4 et :
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h" // for intptr_t
+#include <stdint.h> // for intptr_t
 
 #include "PluginInstanceParent.h"
 #include "BrowserStreamParent.h"
 #include "PluginBackgroundDestroyer.h"
 #include "PluginModuleParent.h"
 #include "PluginStreamParent.h"
 #include "StreamNotifyParent.h"
 #include "npfunctions.h"
--- a/dom/plugins/test/testplugin/nptest.h
+++ b/dom/plugins/test/testplugin/nptest.h
@@ -34,17 +34,17 @@
 #ifndef nptest_h_
 #define nptest_h_
 
 #include "mozilla-config.h"
 
 #include "npapi.h"
 #include "npfunctions.h"
 #include "npruntime.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <string>
 #include <sstream>
 
 typedef enum  {
   DM_DEFAULT,
   DM_SOLID_COLOR
 } DrawMode;
 
--- a/dom/system/gonk/AutoMounter.h
+++ b/dom/system/gonk/AutoMounter.h
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_system_automounter_h__
 #define mozilla_system_automounter_h__
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsCString;
 
 namespace mozilla {
 namespace system {
 
 // AutoMounter modes
 #define AUTOMOUNTER_DISABLE                 0
--- a/dom/workers/Workers.h
+++ b/dom/workers/Workers.h
@@ -4,17 +4,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_workers_workers_h__
 #define mozilla_dom_workers_workers_h__
 
 #include "jsapi.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsStringGlue.h"
 
 #define BEGIN_WORKERS_NAMESPACE \
   namespace mozilla { namespace dom { namespace workers {
 #define END_WORKERS_NAMESPACE \
--- a/gfx/2d/Types.h
+++ b/gfx/2d/Types.h
@@ -1,20 +1,20 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MOZILLA_GFX_TYPES_H_
 #define MOZILLA_GFX_TYPES_H_
 
-#include "mozilla/StandardInteger.h"
 #include "mozilla/NullPtr.h"
 
 #include <stddef.h>
+#include <stdint.h>
 
 namespace mozilla {
 namespace gfx {
 
 typedef float Float;
 
 enum SurfaceType
 {
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -47,17 +47,17 @@
 #include "GLScreenBuffer.h"
 
 typedef char realGLboolean;
 
 #include "GLContextSymbols.h"
 
 #include "mozilla/mozalloc.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Mutex.h"
 #include "mozilla/GenericRefCounted.h"
 
 namespace android {
     class GraphicBuffer;
 }
 
 namespace mozilla {
--- a/gfx/gl/GLContextUtils.cpp
+++ b/gfx/gl/GLContextUtils.cpp
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GLContext.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 using namespace mozilla::gfx;
 
 namespace mozilla {
 namespace gl {
 
 static const char kTexBlit_VertShaderSource[] = "\
 attribute vec2 aPosition;                   \n\
--- a/gfx/gl/GLDefs.h
+++ b/gfx/gl/GLDefs.h
@@ -32,17 +32,17 @@ typedef void GLvoid;
 typedef char GLchar;
 #ifndef __gl2_h_
 typedef ptrdiff_t GLsizeiptr;
 typedef ptrdiff_t GLintptr;
 #endif
 
 #endif /* #if !defined(__gltypes_h_) && !defined(__gl_h_) */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // ARB_sync
 typedef struct __GLsync* GLsync;
 typedef int64_t GLint64;
 typedef uint64_t GLuint64;
 
 // OES_EGL_image (GLES)
 typedef void* GLeglImage;
--- a/gfx/gl/SharedSurface.h
+++ b/gfx/gl/SharedSurface.h
@@ -10,17 +10,17 @@
  *     SharedSurface_GLTexture
  *     SharedSurface_EGLImage
  *     SharedSurface_ANGLEShareHandle
  */
 
 #ifndef SHARED_SURFACE_H_
 #define SHARED_SURFACE_H_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Attributes.h"
 #include "GLDefs.h"
 #include "gfxPoint.h"
 #include "SurfaceTypes.h"
 
 namespace mozilla {
 namespace gfx {
 
--- a/gfx/gl/SurfaceTypes.h
+++ b/gfx/gl/SurfaceTypes.h
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef SURFACE_TYPES_H_
 #define SURFACE_TYPES_H_
 
 #include "mozilla/TypedEnum.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include <cstring>
 
 namespace mozilla {
 namespace layers {
 class ISurfaceAllocator;
 }
 
--- a/gfx/layers/ImageDataSerializer.h
+++ b/gfx/layers/ImageDataSerializer.h
@@ -3,20 +3,21 @@
  */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef GFX_LAYERS_BLOBSURFACE_H
 #define GFX_LAYERS_BLOBSURFACE_H
 
-#include "mozilla/StandardInteger.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/RefPtr.h"
 
+#include <stdint.h>
+
 class gfxImageSurface;
 
 namespace mozilla {
 namespace gfx {
 class DataSourceSurface;
 } // namespace gfx
 } // namespace mozilla
 
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -11,20 +11,21 @@
 #include "mozilla/layers/ContentClient.h"
 #include "mozilla/layers/ShadowLayers.h"
 #include "mozilla/layers/SharedPlanarYCbCrImage.h"
 #include "GLContext.h"
 #include "BasicLayers.h" // for PaintContext
 #include "mozilla/layers/YCbCrImageDataSerializer.h"
 #include "gfxReusableSurfaceWrapper.h"
 #include "gfxPlatform.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/layers/ImageDataSerializer.h"
 #include "gfx2DGlue.h"
 
+#include <stdint.h>
+
 using namespace mozilla::gl;
 
 namespace mozilla {
 namespace layers {
 
 
 
 
--- a/gfx/layers/ipc/CompositableForwarder.h
+++ b/gfx/layers/ipc/CompositableForwarder.h
@@ -2,17 +2,17 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MOZILLA_LAYERS_COMPOSITABLEFORWARDER
 #define MOZILLA_LAYERS_COMPOSITABLEFORWARDER
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "gfxASurface.h"
 #include "GLDefs.h"
 #include "mozilla/layers/ISurfaceAllocator.h"
 
 namespace mozilla {
 namespace layers {
 
 class CompositableClient;
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@@ -1,18 +1,17 @@
 #ifndef QCMS_TYPES_H
 #define QCMS_TYPES_H
 
 #ifdef MOZ_QCMS
 
 #include "prtypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-/* StandardInteger.h defines int*_t and uintptr_t */
 
 #if defined(_AIX)
 #include <sys/types.h>
 #elif defined(__OS2__)
 #include <stdlib.h>
 #endif
 
 #else // MOZ_QCMS
--- a/gfx/thebes/gfxScriptItemizer.h
+++ b/gfx/thebes/gfxScriptItemizer.h
@@ -45,17 +45,17 @@
  *
  * All trademarks and registered trademarks mentioned herein are the property
  * of their respective owners. 
  */
 
 #ifndef GFX_SCRIPTITEMIZER_H
 #define GFX_SCRIPTITEMIZER_H
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "prtypes.h"
 #include "harfbuzz/hb.h"
 #include "nsUnicodeScriptCodes.h"
 
 #define PAREN_STACK_DEPTH 32
 
 class gfxScriptItemizer
 {
--- a/gfx/ycbcr/chromium_types.h
+++ b/gfx/ycbcr/chromium_types.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef GFX_CHROMIUMTYPES_H
 #define GFX_CHROMIUMTYPES_H
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // On Windows, protypes.h is #included, which defines these types.  This sucks!
 #ifndef PROTYPES_H
 typedef uint8_t uint8;
 typedef int8_t int8;
 typedef int16_t int16;
 typedef uint16_t uint16;
 typedef uint32_t uint32;
--- a/image/src/ImageMetadata.h
+++ b/image/src/ImageMetadata.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "nsSize.h"
 
 namespace mozilla {
 namespace image {
 
 class RasterImage;
 
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -33,17 +33,17 @@
 #include "nsICODecoder.h"
 #include "nsIconDecoder.h"
 
 #include "gfxContext.h"
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Services.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/gfx/Scale.h"
 
 #include "GeckoProfiler.h"
 #include <algorithm>
 
--- a/intl/uconv/tools/umaptable.c
+++ b/intl/uconv/tools/umaptable.c
@@ -2,17 +2,17 @@
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #define NOMAPPING 0xfffd
 
 typedef struct {
 		uint16_t srcBegin;		/* 2 byte	*/
 		uint16_t srcEnd;		/* 2 byte	*/
 		uint16_t destBegin;		/* 2 byte	*/
 } uFormat0;
--- a/intl/uconv/util/ubase.h
+++ b/intl/uconv/util/ubase.h
@@ -1,14 +1,14 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef ubase_h__
 #define ubase_h__
 
 #include "prtypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #define PRIVATE 
 #define MODULE_PRIVATE
 
 #endif
--- a/intl/unicharutil/tools/genUnicodePropertyData.pl
+++ b/intl/unicharutil/tools/genUnicodePropertyData.pl
@@ -618,17 +618,17 @@ print DATA_TABLES <<__END;
  *
 
 $versionInfo
 
  *
  * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
  */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "harfbuzz/hb.h"
 
 __END
 
 open HEADER, "> nsUnicodeScriptCodes.h" or die "unable to open nsUnicodeScriptCodes.h for output";
 
 print HEADER <<__END;
 $licenseBlock
--- a/intl/unicharutil/util/nsSpecialCasingData.h
+++ b/intl/unicharutil/util/nsSpecialCasingData.h
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "prtypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 namespace mozilla {
 namespace unicode {
 
 // Multi-character mappings (from SpecialCasing.txt) map a single Unicode
 // value to a sequence of 2 or 3 Unicode characters. There are currently none
 // defined outside the BMP, so we can use PRUnichar here. Unused trailing
 // positions in mMappedChars are set to 0.
--- a/intl/unicharutil/util/nsUnicodePropertyData.cpp
+++ b/intl/unicharutil/util/nsUnicodePropertyData.cpp
@@ -49,17 +49,17 @@ for the Unicode Character Database (UCD)
 #
 # Unihan_Variants.txt
 # Date: 2012-08-17 17:13:30 GMT [JHJ]
 
  *
  * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
  */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "harfbuzz/hb.h"
 
 static const uint32_t sScriptCodeToTag[] = {
   HB_TAG('Z','y','y','y'),
   HB_TAG('Z','i','n','h'),
   HB_TAG('A','r','a','b'),
   HB_TAG('A','r','m','n'),
   HB_TAG('B','e','n','g'),
--- a/ipc/chromium/src/base/basictypes.h
+++ b/ipc/chromium/src/base/basictypes.h
@@ -7,17 +7,17 @@
 
 #include <limits.h>         // So we can set the bounds of our types
 #include <stddef.h>         // For size_t
 #include <string.h>         // for memcpy
 
 #include "base/port.h"    // Types that only need exist on certain systems
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // A type to represent a Unicode code-point value. As of Unicode 4.0,
 // such values require up to 21 bits.
 // (For type-checking on pointers, make this explicitly signed,
 // and it should always be the signed version of whatever int32_t is.)
 typedef signed int         char32;
 
 const uint8_t  kuint8max  = (( uint8_t) 0xFF);
--- a/ipc/glue/IPCMessageUtils.h
+++ b/ipc/glue/IPCMessageUtils.h
@@ -12,17 +12,18 @@
 
 #include "mozilla/TimeStamp.h"
 #ifdef XP_WIN
 #include "mozilla/TimeStamp_windows.h"
 #endif
 #include "mozilla/Util.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Point.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 #include "nsID.h"
 #include "nsMemory.h"
 #include "nsStringGlue.h"
 #include "nsTArray.h"
 #include "gfx3DMatrix.h"
 #include "gfxColor.h"
 #include "gfxMatrix.h"
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -3,20 +3,20 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ctypes/CTypes.h"
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
 
 #include <limits>
 #include <math.h>
+#include <stdint.h>
 
 #if defined(XP_WIN) || defined(XP_OS2)
 #include <float.h>
 #endif
 
 #if defined(SOLARIS)
 #include <ieeefp.h>
 #endif
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -4,19 +4,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef gc_Heap_h
 #define gc_Heap_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/PodOperations.h"
-#include "mozilla/StandardInteger.h"
 
 #include <stddef.h>
+#include <stdint.h>
 
 #include "jspubtd.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "ds/BitArray.h"
 #include "js/HeapAPI.h"
 
--- a/js/src/ion/arm/Architecture-arm.cpp
+++ b/js/src/ion/arm/Architecture-arm.cpp
@@ -1,18 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ion/arm/Architecture-arm.h"
 
-#include "mozilla/StandardInteger.h"
-
 #include <elf.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "ion/arm/Assembler-arm.h"
 
--- a/js/src/ion/arm/Architecture-arm.h
+++ b/js/src/ion/arm/Architecture-arm.h
@@ -2,19 +2,18 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef ion_arm_Architecture_arm_h
 #define ion_arm_Architecture_arm_h
 
-#include "mozilla/StandardInteger.h"
-
 #include <limits.h>
+#include <stdint.h>
 
 // gcc appears to use __ARM_PCS_VFP to denote that the target is a hard-float target.
 #ifdef __ARM_PCS_VFP
 #define JS_CPU_ARM_HARDFP
 #endif
 namespace js {
 namespace ion {
 
--- a/js/src/ion/shared/IonFrames-x86-shared.h
+++ b/js/src/ion/shared/IonFrames-x86-shared.h
@@ -2,17 +2,17 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef ion_shared_IonFrames_x86_shared_h
 #define ion_shared_IonFrames_x86_shared_h
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include "ion/shared/IonFrames-shared.h"
 
 namespace js {
 namespace ion {
 
 class IonCommonFrameLayout
 {
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -7,21 +7,21 @@
 /* JavaScript API. */
 
 #ifndef jsapi_h
 #define jsapi_h
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/RangedPtr.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/ThreadLocal.h"
 
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 
 #include "js-config.h"
 #include "jsalloc.h"
 #include "jspubtd.h"
 
 #include "js/CallArgs.h"
 #include "js/CharacterEncoding.h"
--- a/js/src/jscrashreport.h
+++ b/js/src/jscrashreport.h
@@ -3,17 +3,18 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef jscrashreport_h
 #define jscrashreport_h
 
 #include "mozilla/GuardObjects.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 namespace js {
 namespace crash {
 
 void
 SnapshotGCStack();
 
 void
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -2,17 +2,18 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsfriendapi.h"
 
 #include "mozilla/PodOperations.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsgc.h"
 #include "jsobj.h"
 #include "jswatchpoint.h"
 #include "jsweakmap.h"
 #include "jswrapper.h"
--- a/js/src/prmjtime.h
+++ b/js/src/prmjtime.h
@@ -2,18 +2,17 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef prmjtime_h
 #define prmjtime_h
 
-#include "mozilla/StandardInteger.h"
-
+#include <stdint.h>
 #include <time.h>
 
 /*
  * Broken down form of 64 bit time value.
  */
 struct PRMJTime {
     int32_t tm_usec;            /* microseconds of second (0-999999) */
     int8_t tm_sec;              /* seconds of minute (0-59) */
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
@@ -4,17 +4,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef vm_DateTime_h
 #define vm_DateTime_h
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 #include "vm/NumericConversions.h"
 
 namespace js {
 
 /* Constants defined by ES5 15.9.1.10. */
 const double HoursPerDay = 24;
 const double MinutesPerHour = 60;
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -4,17 +4,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef vm_ObjectImpl_h
 #define vm_ObjectImpl_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/GuardObjects.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 #include "jsfriendapi.h"
 #include "jsinfer.h"
 
 #include "gc/Barrier.h"
 #include "gc/Heap.h"
 #include "js/Value.h"
 #include "vm/NumericConversions.h"
--- a/js/src/vm/ThreadPool.h
+++ b/js/src/vm/ThreadPool.h
@@ -2,19 +2,18 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef vm_ThreadPool_h
 #define vm_ThreadPool_h
 
-#include "mozilla/StandardInteger.h"
-
 #include <stddef.h>
+#include <stdint.h>
 
 #include "jsalloc.h"
 #ifdef JS_THREADSAFE
 # include "prcvar.h"
 # include "prlock.h"
 # include "prtypes.h"
 #endif
 
--- a/js/src/yarr/CheckedArithmetic.h
+++ b/js/src/yarr/CheckedArithmetic.h
@@ -26,17 +26,17 @@
  */
 
 #ifndef yarr_CheckedArithmetic_h
 #define yarr_CheckedArithmetic_h
 
 #include "assembler/wtf/Assertions.h"
 
 #include <limits>
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/TypeTraits.h"
 
 #ifdef _MSC_VER
 # undef min
 # undef max
 #endif
 
 /* Checked<T>
--- a/js/src/yarr/PageBlock.h
+++ b/js/src/yarr/PageBlock.h
@@ -25,19 +25,18 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef yarr_PageBlock_h
 #define yarr_PageBlock_h
 
-#include "mozilla/StandardInteger.h"
-
 #include <stddef.h>
+#include <stdint.h>
 
 namespace WTF {
 
 size_t pageSize();
 inline bool isPageAligned(void* address) { return !(reinterpret_cast<intptr_t>(address) & (pageSize() - 1)); }
 inline bool isPageAligned(size_t size) { return !(size & (pageSize() - 1)); }
 inline bool isPowerOfTwo(size_t size) { return !(size & (size - 1)); }
 
--- a/js/src/yarr/YarrCanonicalizeUCS2.h
+++ b/js/src/yarr/YarrCanonicalizeUCS2.h
@@ -23,17 +23,17 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #ifndef yarr_YarrCanonicalizeUCS2_h
 #define yarr_YarrCanonicalizeUCS2_h
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include "yarr/wtfbridge.h"
 
 namespace JSC { namespace Yarr {
 
 // This set of data (autogenerated using YarrCanonicalizeUCS2.js into YarrCanonicalizeUCS2.cpp)
 // provides information for each UCS2 code point as to the set of code points that it should
 // match under the ES5.1 case insensitive RegExp matching rules, specified in 15.10.2.8.
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -17,17 +17,17 @@
 #include "jsproxy.h"
 #include "AccessCheck.h"
 #include "WrapperFactory.h"
 #include "XrayWrapper.h"
 
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 #include <algorithm>
 
 using namespace xpc;
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace JS;
--- a/js/xpconnect/src/xpcObjectHelper.h
+++ b/js/xpconnect/src/xpcObjectHelper.h
@@ -8,17 +8,17 @@
 // Including 'windows.h' will #define GetClassInfo to something else.
 #ifdef XP_WIN
 #ifdef GetClassInfo
 #undef GetClassInfo
 #endif
 #endif
 
 #include "mozilla/Attributes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIClassInfo.h"
 #include "nsISupports.h"
 #include "nsIXPCScriptable.h"
 #include "nsWrapperCache.h"
 
 class xpcObjectHelper
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -73,23 +73,24 @@
 /* All the XPConnect private declarations - only include locally. */
 
 #ifndef xpcprivate_h___
 #define xpcprivate_h___
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 
+#include <math.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <math.h>
+
 #include "xpcpublic.h"
 #include "jsapi.h"
 #include "jsprf.h"
 #include "pldhash.h"
 #include "prprf.h"
 #include "jsdbgapi.h"
 #include "jsfriendapi.h"
 #include "js/HeapAPI.h"
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -46,17 +46,17 @@
 #include "GeckoProfiler.h"
 #include "nsAnimationManager.h"
 #include "nsTransitionManager.h"
 #include "nsViewManager.h"
 #include "ImageLayers.h"
 #include "ImageContainer.h"
 #include "nsCanvasFrame.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>
 
 using namespace mozilla;
 using namespace mozilla::css;
 using namespace mozilla::layers;
 using namespace mozilla::dom;
 typedef FrameMetrics::ViewID ViewID;
 
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -23,17 +23,17 @@
 #include "plarena.h"
 #include "nsRegion.h"
 #include "FrameLayerBuilder.h"
 #include "nsThemeConstants.h"
 #include "nsLayoutUtils.h"
 #include "nsDisplayListInvalidation.h"
 #include "DisplayListClipState.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include <stdlib.h>
 #include <algorithm>
 
 class nsIPresShell;
 class nsIContent;
 class nsRenderingContext;
 class nsDeviceContext;
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@@ -7,17 +7,17 @@
 
 /* arena allocation for the frame tree and closely-related objects */
 
 #ifndef nsPresArena_h___
 #define nsPresArena_h___
 
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nscore.h"
 #include "nsQueryFrame.h"
 #include "nsTArray.h"
 #include "nsTHashtable.h"
 #include "plarena.h"
 
 struct nsArenaMemoryStats;
 
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -39,17 +39,17 @@
 #include "nsEventDispatcher.h"
 #include "nsContentUtils.h"
 #include "nsLayoutUtils.h"
 #include "nsBidiUtils.h"
 #include "nsFrameManager.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/MathAlgorithms.h"
 #include "FrameLayerBuilder.h"
 #include "nsSMILKeySpline.h"
 #include "nsSubDocumentFrame.h"
 #include "nsSVGOuterSVGFrame.h"
 #include "mozilla/Attributes.h"
 #include "ScrollbarActivity.h"
--- a/layout/style/nsRuleData.cpp
+++ b/layout/style/nsRuleData.cpp
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsRuleData.h"
 
 #include "mozilla/Poison.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 inline size_t
 nsRuleData::GetPoisonOffset()
 {
   // Fill in mValueOffsets such that mValueStorage + mValueOffsets[i]
   // will yield the frame poison value for all uninitialized value
   // offsets.
   MOZ_STATIC_ASSERT(sizeof(uintptr_t) == sizeof(size_t),
--- a/layout/style/nsRuleNode.h
+++ b/layout/style/nsRuleNode.h
@@ -9,17 +9,17 @@
  */
 
 #ifndef nsRuleNode_h___
 #define nsRuleNode_h___
 
 #include "nsPresContext.h"
 #include "nsStyleStruct.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsStyleContext;
 struct nsRuleData;
 class nsIStyleRule;
 struct nsCSSValueList;
 
 class nsCSSValue;
 struct nsCSSRect;
--- a/layout/tables/celldata.h
+++ b/layout/tables/celldata.h
@@ -3,17 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef CellData_h__
 #define CellData_h__
 
 #include "nsISupports.h"
 #include "nsCoord.h"
 #include "mozilla/gfx/Types.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsTableCellFrame;
 class nsCellMap;
 class BCCellData;
 
 
 #define MAX_ROWSPAN 65534 // the cellmap can not handle more.
 #define MAX_COLSPAN 1000 // limit as IE and opera do.  If this ever changes,
--- a/media/libcubeb/include/cubeb-stdint.h
+++ b/media/libcubeb/include/cubeb-stdint.h
@@ -1,5 +1,5 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
--- a/media/libjpeg/jmorecfg.h
+++ b/media/libjpeg/jmorecfg.h
@@ -7,17 +7,17 @@
  * Copyright (C) 2009, 2011, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains additional configuration options that customize the
  * JPEG software for special applications or support machine-dependent
  * optimizations.  Most users will not need to touch this file.
  */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 /*
  * Define BITS_IN_JSAMPLE as either
  *   8   for 8-bit sample values (the usual setting)
  *   12  for 12-bit sample values
  * Only 8 and 12 are legal data precisions for lossy JPEG according to the
  * JPEG standard, and the IJG code does not support anything else!
  * We do not support run-time selection of data precision, sorry.
--- a/media/libjpeg/mozilla.diff
+++ b/media/libjpeg/mozilla.diff
@@ -57,17 +57,17 @@ diff -up8 jmorecfg.h jmorecfg.h
   * Copyright (C) 2009, 2011, D. R. Commander.
   * For conditions of distribution and use, see the accompanying README file.
   *
   * This file contains additional configuration options that customize the
   * JPEG software for special applications or support machine-dependent
   * optimizations.  Most users will not need to touch this file.
   */
  
-+#include "mozilla/StandardInteger.h"
++#include <stdint.h>
  
  /*
   * Define BITS_IN_JSAMPLE as either
   *   8   for 8-bit sample values (the usual setting)
   *   12  for 12-bit sample values
   * Only 8 and 12 are legal data precisions for lossy JPEG according to the
   * JPEG standard, and the IJG code does not support anything else!
   * We do not support run-time selection of data precision, sorry.
--- a/media/mtransport/objs.mk
+++ b/media/mtransport/objs.mk
@@ -51,17 +51,16 @@ ifeq ($(OS_TARGET), WINNT)
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/win32/include \
   -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
   $(NULL)
 DEFINES += -DWIN
 endif
 
 DEFINES += \
-   -DR_PLATFORM_INT_TYPES='"mozilla/StandardInteger.h"' \
    -DR_DEFINED_INT2=int16_t -DR_DEFINED_UINT2=uint16_t \
    -DR_DEFINED_INT4=int32_t -DR_DEFINED_UINT4=uint32_t \
    -DR_DEFINED_INT8=int64_t -DR_DEFINED_UINT8=uint64_t \
    $(NULL)
 
 MTRANSPORT_LCPPSRCS = \
   dtlsidentity.cpp \
   nricectx.cpp \
--- a/media/mtransport/third_party/nICEr/nicer.gyp
+++ b/media/mtransport/third_party/nICEr/nicer.gyp
@@ -119,17 +119,17 @@
               'USE_TURN',
               'USE_ICE',
               'USE_RFC_3489_BACKWARDS_COMPATIBLE',
               'USE_STUND_0_96',
               'USE_STUN_PEDANTIC',
               'USE_TURN',
               'NR_SOCKET_IS_VOID_PTR',
               'restrict=',
-	      'R_PLATFORM_INT_TYPES=\'"mozilla/StandardInteger.h"\'',
+	      'R_PLATFORM_INT_TYPES=\'<stdint.h>\'',
 	      'R_DEFINED_INT2=int16_t',
 	      'R_DEFINED_UINT2=uint16_t',
 	      'R_DEFINED_INT4=int32_t',
 	      'R_DEFINED_UINT4=uint32_t',
 	      'R_DEFINED_INT8=int64_t',
 	      'R_DEFINED_UINT8=uint64_t',
           ],
           
--- a/media/mtransport/third_party/nrappkit/nrappkit.gyp
+++ b/media/mtransport/third_party/nrappkit/nrappkit.gyp
@@ -132,17 +132,17 @@
               #'./src/stats/nrstats.h',
               #'./src/stats/nrstats_app.c',
               #'./src/stats/nrstats_int.h',
               #'./src/stats/nrstats_memory.c',
           ],
           
           'defines' : [
               'SANITY_CHECKS',
-	      'R_PLATFORM_INT_TYPES=\'"mozilla/StandardInteger.h"\'',
+	      'R_PLATFORM_INT_TYPES=\'<stdint.h>\'',
 	      'R_DEFINED_INT2=int16_t',
 	      'R_DEFINED_UINT2=uint16_t',
 	      'R_DEFINED_INT4=int32_t',
 	      'R_DEFINED_UINT4=uint32_t',
 	      'R_DEFINED_INT8=int64_t',
 	      'R_DEFINED_UINT8=uint64_t',
           ],
           
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -163,18 +163,18 @@
       'defines' : [
         'LOG4CXX_STATIC',
         '_NO_LOG4CXX',
         'USE_SSLEAY',
         '_CPR_USE_EXTERNAL_LOGGER',
         'WEBRTC_RELATIVE_PATH',
       	'HAVE_WEBRTC_VIDEO',
         'HAVE_WEBRTC_VOICE',
+        'HAVE_STDINT_H=1',
         'HAVE_STDLIB_H=1',
-        'INTEGER_TYPES_H="\\"mozilla/StandardInteger.h\\""',
         'HAVE_UINT8_T=1',
         'HAVE_UINT16_T=1',
         'HAVE_UINT32_T=1',
         'HAVE_UINT64_T=1',
       ],
 
       'cflags_mozilla': [
         '$(NSPR_CFLAGS)',
@@ -217,18 +217,17 @@
         ['OS=="win"', {
           'include_dirs': [
           ],
           'defines': [
             'SIP_OS_WINDOWS',
             'WIN32',
             'GIPS_VER=3480',
             'SIPCC_BUILD',
-            'HAVE_WINSOCK2_H',
-            'CPR_STDINT_INCLUDE=\\"mozilla/StandardInteger.h\\"'
+            'HAVE_WINSOCK2_H'
           ],
 
           'cflags_mozilla': [
           ],
         }],
         ['OS=="mac"', {
           'include_dirs': [
           ],
--- a/media/webrtc/trunk/third_party/libyuv/include/libyuv/basic_types.h
+++ b/media/webrtc/trunk/third_party/libyuv/include/libyuv/basic_types.h
@@ -12,17 +12,17 @@
 #define INCLUDE_LIBYUV_BASIC_TYPES_H_
 
 #include <stddef.h>  // for NULL, size_t
 
 #if !(defined(_MSC_VER) && (_MSC_VER < 1600))
 #include <stdint.h>  // for uintptr_t
 #endif
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 typedef uint64_t uint64;
 typedef int64_t  int64;
 #if defined(_MSC_VER)
 // nsprpub/pr/include/obsolete/protypes.h defines these weirdly
 typedef long int32;
 typedef unsigned long uint32;
 #else
 typedef uint32_t uint32;
--- a/mfbt/BloomFilter.h
+++ b/mfbt/BloomFilter.h
@@ -11,19 +11,19 @@
  * incorrectly answer "yes" when the correct answer is "no").
  */
 
 #ifndef mozilla_BloomFilter_h
 #define mozilla_BloomFilter_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 
+#include <stdint.h>
 #include <string.h>
 
 namespace mozilla {
 
 /*
  * This class implements a counting Bloom filter as described at
  * <http://en.wikipedia.org/wiki/Bloom_filter#Counting_filters>, with
  * 8-bit counters.  This allows quick probabilistic answers to the
--- a/mfbt/CheckedInt.h
+++ b/mfbt/CheckedInt.h
@@ -7,22 +7,22 @@
 /* Provides checked integers, detecting integer overflow and divide-by-0. */
 
 #ifndef mozilla_CheckedInt_h
 #define mozilla_CheckedInt_h
 
 // Enable relying of Mozilla's MFBT for possibly-available C++11 features
 #define MOZ_CHECKEDINT_USE_MFBT
 
+#include <stdint.h>
+
 #ifdef MOZ_CHECKEDINT_USE_MFBT
 #  include "mozilla/Assertions.h"
-#  include "mozilla/StandardInteger.h"
 #else
 #  include <cassert>
-#  include <stdint.h>
 #  define MOZ_STATIC_ASSERT(cond, reason) assert((cond) && reason)
 #  define MOZ_ASSERT(cond, reason) assert((cond) && reason)
 #  define MOZ_DELETE
 #endif
 
 #include <climits>
 #include <cstddef>
 
--- a/mfbt/Endian.h
+++ b/mfbt/Endian.h
@@ -62,19 +62,19 @@
 
 #ifndef mozilla_Endian_h
 #define mozilla_Endian_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Compiler.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/TypeTraits.h"
 
+#include <stdint.h>
 #include <string.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1300
 #  include <stdlib.h>
 #  pragma intrinsic(_byteswap_ushort)
 #  pragma intrinsic(_byteswap_ulong)
 #  pragma intrinsic(_byteswap_uint64)
 #endif
--- a/mfbt/EnumSet.h
+++ b/mfbt/EnumSet.h
@@ -5,17 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* A set abstraction for enumeration values. */
 
 #ifndef mozilla_EnumSet_h
 #define mozilla_EnumSet_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 namespace mozilla {
 
 /**
  * EnumSet<T> is a set of values defined by an enumeration. It is implemented
  * using a 32 bit mask for each value so it will only work for enums with an int
  * representation less than 32. It works both for enum and enum class types.
  */
--- a/mfbt/FloatingPoint.h
+++ b/mfbt/FloatingPoint.h
@@ -7,17 +7,18 @@
 /* Various predicates and operations on IEEE-754 floating point types. */
 
 #ifndef mozilla_FloatingPoint_h
 #define mozilla_FloatingPoint_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Casting.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 namespace mozilla {
 
 /*
  * It's reasonable to ask why we have this header at all.  Don't isnan,
  * copysign, the built-in comparison operators, and the like solve these
  * problems?  Unfortunately, they don't.  We've found that various compilers
  * (MSVC, MSVC when compiling with PGO, and GCC on OS X, at least) miscompile
--- a/mfbt/HashFunctions.h
+++ b/mfbt/HashFunctions.h
@@ -43,19 +43,20 @@
  * in nsHashKeys.h.
  */
 
 #ifndef mozilla_HashFunctions_h
 #define mozilla_HashFunctions_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Types.h"
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 namespace mozilla {
 
 /**
  * The golden ratio as a 32-bit fixed-point value.
  */
 static const uint32_t GoldenRatioU32 = 0x9E3779B9U;
 
--- a/mfbt/MathAlgorithms.h
+++ b/mfbt/MathAlgorithms.h
@@ -5,21 +5,21 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* mfbt maths algorithms. */
 
 #ifndef mozilla_MathAlgorithms_h
 #define mozilla_MathAlgorithms_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/TypeTraits.h"
 
 #include <cmath>
 #include <limits.h>
+#include <stdint.h>
 
 namespace mozilla {
 
 // Greatest Common Divisor
 template<typename IntegerType>
 MOZ_ALWAYS_INLINE IntegerType
 EuclidGCD(IntegerType a, IntegerType b)
 {
--- a/mfbt/Poison.h
+++ b/mfbt/Poison.h
@@ -8,19 +8,20 @@
  * A poison value that can be used to fill a memory space with
  * an address that leads to a safe crash when dereferenced.
  */
 
 #ifndef mozilla_Poison_h
 #define mozilla_Poison_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Types.h"
 
+#include <stdint.h>
+
 MOZ_BEGIN_EXTERN_C
 
 extern MFBT_DATA uintptr_t gMozillaPoisonValue;
 
 /**
  * @return the poison value.
  */
 inline uintptr_t mozPoisonValue()
--- a/mfbt/SHA1.h
+++ b/mfbt/SHA1.h
@@ -4,20 +4,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Simple class for computing SHA1. */
 
 #ifndef mozilla_SHA1_h
 #define mozilla_SHA1_h
 
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Types.h"
 
 #include <stddef.h>
+#include <stdint.h>
 
 namespace mozilla {
 
 /**
  * This class computes the SHA1 hash of a byte sequence, or of the concatenation
  * of multiple sequences.  For example, computing the SHA1 of two sequences of
  * bytes could be done as follows:
  *
deleted file mode 100644
--- a/mfbt/StandardInteger.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Implements the C99 <stdint.h> interface for C and C++ code. */
-
-#ifndef mozilla_StandardInteger_h
-#define mozilla_StandardInteger_h
-
-/*
- * The C99 standard header <stdint.h> exposes typedefs for common fixed-width
- * integer types.  It would be feasible to simply #include <stdint.h>, but
- * MSVC++ versions prior to 2010 don't provide <stdint.h>.  We could solve this
- * by reimplementing <stdint.h> for MSVC++ 2008 and earlier.  But then we reach
- * a second problem: our custom <stdint.h> might conflict with a <stdint.h>
- * defined by an embedder already looking to work around the MSVC++ <stdint.h>
- * absence.
- *
- * We address these issues in this manner:
- *
- *   1. If the preprocessor macro MOZ_CUSTOM_STDINT_H is defined to a path to a
- *      custom <stdint.h> implementation, we will #include it.  Embedders using
- *      a custom <stdint.h> must define this macro to an implementation that
- *      will work with their embedding.
- *   2. Otherwise, if we are compiling with a an MSVC++ version without
- *      <stdint.h>, #include our custom <stdint.h> reimplementation.
- *   3. Otherwise, #include the standard <stdint.h> provided by the compiler.
- *
- * Note that we can't call this file "stdint.h" or something case-insensitively
- * equal to "stdint.h" because then MSVC (and other compilers on
- * case-insensitive file systems) will include this file, rather than the system
- * stdint.h, when we ask for <stdint.h> below.
- */
-#if defined(MOZ_CUSTOM_STDINT_H)
-#  include MOZ_CUSTOM_STDINT_H
-#elif defined(_MSC_VER) && _MSC_VER < 1600
-#  include "mozilla/MSStdInt.h"
-#else
-#  include <stdint.h>
-#endif
-
-#endif /* mozilla_StandardInteger_h */
--- a/mfbt/Types.h
+++ b/mfbt/Types.h
@@ -9,26 +9,19 @@
 #ifndef mozilla_Types_h
 #define mozilla_Types_h
 
 /*
  * This header must be valid C and C++, includable by code embedding either
  * SpiderMonkey or Gecko.
  */
 
-/*
- * Expose all the integer types defined in C99's <stdint.h> (and the integer
- * limit and constant macros, if compiling C code or if compiling C++ code and
- * the right __STDC_*_MACRO has been defined for each).  These are all usable
- * throughout mfbt code, and throughout Mozilla code more generally.
- */
-#include "mozilla/StandardInteger.h"
-
-/* Also expose size_t. */
+/* Expose all <stdint.h> types and size_t. */
 #include <stddef.h>
+#include <stdint.h>
 
 /* Implement compiler and linker macros needed for APIs. */
 
 /*
  * MOZ_EXPORT is used to declare and define a symbol or type which is externally
  * visible to users of the current library.  It encapsulates various decorations
  * needed to properly export the method's symbol.
  *
--- a/mfbt/decimal/Decimal.h
+++ b/mfbt/decimal/Decimal.h
@@ -33,17 +33,17 @@
  * http://src.chromium.org/viewvc/blink/trunk/Source/core/platform/Decimal.h
  * Check hg log for the svn rev of the last update from Blink core.
  */
 
 #ifndef Decimal_h
 #define Decimal_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Types.h"
 
 #include <string>
 
 #ifndef ASSERT
 #define DEFINED_ASSERT_FOR_DECIMAL_H 1
 #define ASSERT MOZ_ASSERT
 #endif
--- a/mfbt/decimal/to-moz-dependencies.patch
+++ b/mfbt/decimal/to-moz-dependencies.patch
@@ -133,17 +133,17 @@ diff --git a/mfbt/decimal/Decimal.h b/mf
 + * http://src.chromium.org/viewvc/blink/trunk/Source/core/platform/Decimal.h
 + * Check hg log for the svn rev of the last update from Blink core.
 + */
 +
  #ifndef Decimal_h
  #define Decimal_h
  
 +#include "mozilla/Assertions.h"
-+#include "mozilla/StandardInteger.h"
++#include <stdint.h>
  #include "mozilla/Types.h"
  
 -#include <stdint.h>
 -#include <wtf/Assertions.h>
 -#include <wtf/text/WTFString.h>
 +#include <string>
 +
 +#ifndef ASSERT
--- a/mfbt/double-conversion/use-StandardInteger.patch
+++ b/mfbt/double-conversion/use-StandardInteger.patch
@@ -18,12 +18,12 @@ index cd3e330..bdc7d4b 100644
 -typedef unsigned __int64 uint64_t;
 -// intptr_t and friends are defined in crtdefs.h through stdio.h.
 -
 -#else
 -
 -#include <stdint.h>
 -
 -#endif
-+#include "mozilla/StandardInteger.h"
++#include <stdint.h>
  
  // The following macro works on both 32 and 64-bit platforms.
  // Usage: instead of writing 0x1234567890123456
--- a/mfbt/double-conversion/utils.h
+++ b/mfbt/double-conversion/utils.h
@@ -69,17 +69,17 @@
 #else
 #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
 #endif  // _WIN32
 #else
 #error Target architecture was not detected as supported by Double-Conversion.
 #endif
 
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // The following macro works on both 32 and 64-bit platforms.
 // Usage: instead of writing 0x1234567890123456
 //      write UINT64_2PART_C(0x12345678,90123456);
 #define UINT64_2PART_C(a, b) (((static_cast<uint64_t>(a) << 32) + 0x##b##u))
 
 
 // The expression ARRAY_SIZE(a) is a compile-time constant of type
--- a/mfbt/exported_headers.mk
+++ b/mfbt/exported_headers.mk
@@ -39,17 +39,16 @@ EXPORTS_mozilla += \
   Poison.h \
   Range.h \
   RangedPtr.h \
   ReentrancyGuard.h \
   RefPtr.h \
   Scoped.h \
   SHA1.h \
   SplayTree.h \
-  StandardInteger.h \
   TemplateLib.h \
   ThreadLocal.h \
   TypedEnum.h \
   Types.h \
   TypeTraits.h \
   Util.h \
   Vector.h \
   WeakPtr.h \
--- a/mfbt/tests/TestCasting.cpp
+++ b/mfbt/tests/TestCasting.cpp
@@ -1,15 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Casting.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>
 
 using mozilla::BitwiseCast;
 using mozilla::detail::IsInBounds;
 
 template<typename Uint, typename Ulong, bool = (sizeof(Uint) == sizeof(Ulong))>
 struct UintUlongBitwiseCast;
 
 template<typename Uint, typename Ulong>
--- a/modules/libmar/sign/nss_secutil.h
+++ b/modules/libmar/sign/nss_secutil.h
@@ -9,17 +9,17 @@
 #define NSS_SECUTIL_H_
 
 #include "nss.h"
 #include "pk11pub.h"
 #include "cryptohi.h"
 #include "hasht.h"
 #include "cert.h"
 #include "key.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 typedef struct {
   enum {
     PW_NONE = 0,
     PW_FROMFILE = 1,
     PW_PLAINTEXT = 2,
     PW_EXTERNAL = 3
   } source;
--- a/modules/libmar/src/mar.h
+++ b/modules/libmar/src/mar.h
@@ -3,17 +3,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MAR_H__
 #define MAR_H__
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* We have a MAX_SIGNATURES limit so that an invalid MAR will never
  * waste too much of either updater's or signmar's time.
  * It is also used at various places internally and will affect memory usage.
--- a/modules/libmar/src/mar_private.h
+++ b/modules/libmar/src/mar_private.h
@@ -4,17 +4,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MAR_PRIVATE_H__
 #define MAR_PRIVATE_H__
 
 #include "limits.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #define BLOCKSIZE 4096
 #define ROUND_UP(n, incr) (((n) / (incr) + 1) * (incr))
 
 #define MAR_ID "MAR1"
 #define MAR_ID_SIZE 4
 
 /* The signature block comes directly after the header block 
--- a/netwerk/base/src/DashboardTypes.h
+++ b/netwerk/base/src/DashboardTypes.h
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_net_DashboardTypes_h_
 #define mozilla_net_DashboardTypes_h_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsStringGlue.h"
 #include "nsTArray.h"
 
 namespace mozilla {
 namespace net {
 
 struct SocketInfo
 {
--- a/netwerk/dns/nsIDNKitInterface.h
+++ b/netwerk/dns/nsIDNKitInterface.h
@@ -38,22 +38,22 @@
  *    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  *    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  *    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
 #ifndef nsIDNKitWrapper_h__
 #define nsIDNKitWrapper_h__
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mozilla/StandardInteger.h"
-
 /*
  * libidnkit result code.
  */
 typedef enum {
 	idn_success,
 	idn_notfound,
 	idn_invalid_encoding,
 	idn_invalid_syntax,
--- a/netwerk/sctp/datachannel/DataChannel.cpp
+++ b/netwerk/sctp/datachannel/DataChannel.cpp
@@ -7,17 +7,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
 #if !defined(__Userspace_os_Windows)
 #include <arpa/inet.h>
 #endif
 
 #define SCTP_DEBUG 1
-#define SCTP_STDINT_INCLUDE "mozilla/StandardInteger.h"
+#define SCTP_STDINT_INCLUDE <stdint.h>
 
 #ifdef _MSC_VER
 // Disable "warning C4200: nonstandard extension used : zero-sized array in
 //          struct/union"
 // ...which the third-party file usrsctp.h runs afoul of.
 #pragma warning(push)
 #pragma warning(disable:4200)
 #endif
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -52,24 +52,23 @@ DISABLED_CSRCS := \
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/include \
   -I$(srcdir)/crypto/include \
   $(NULL)
 
 DEFINES += \
   -DHAVE_STDLIB_H=1 \
-  -DINTEGER_TYPES_H="\"mozilla/StandardInteger.h\"" \
   -DHAVE_UINT8_T=1 \
   -DHAVE_UINT16_T=1 \
   -DHAVE_UINT32_T=1 \
   -DHAVE_UINT64_T=1 \
   $(NULL)
 
-# We know StandardInteger.h will define uint8/16/32/64_t, so we don't need
+# We know stdint.h will define uint8/16/32/64_t, so we don't need
 # to define SIZEOF_UNSIGNED_LONG/SIZEOF_UNSIGNED_LONG_LONG
 
 ifeq ($(CPU_ARCH),arm)
 
 # XXX while arm is not a CISC architecture, the code guarded by CPU_RISC makes
 # (at least) the AES ciphers fail their self-tests on ARM, so for now we're
 # falling back to the (presumably) slower-on-this-architecture but working
 # code path.  https://bugzilla.mozilla.org/show_bug.cgi?id=822380 has been filed
--- a/other-licenses/snappy/snappy-stubs-public.h
+++ b/other-licenses/snappy/snappy-stubs-public.h
@@ -31,17 +31,17 @@
 //
 // This file cannot include config.h, as it is included from snappy.h,
 // which is a public header. Instead, snappy-stubs-public.h is generated by
 // from snappy-stubs-public.h.in at configure time.
 
 #ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 #define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #if defined IS_BIG_ENDIAN || defined __BIG_ENDIAN__
 #define WORDS_BIGENDIAN
 #endif
 
 #define SNAPPY_MAJOR 1
 #define SNAPPY_MINOR 0
 #define SNAPPY_PATCHLEVEL 4
--- a/security/manager/boot/src/nsSTSPreloadList.inc
+++ b/security/manager/boot/src/nsSTSPreloadList.inc
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*****************************************************************************/
 /* This is an automatically generated file. If you're not                    */
 /* nsStrictTransportSecurityService.cpp, you shouldn't be #including it.     */
 /*****************************************************************************/
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 const PRTime gPreloadListExpirationTime = INT64_C(1385805971022000);
 
 class nsSTSPreload
 {
   public:
     const char *mHost;
     const bool mIncludeSubdomains;
 };
--- a/security/manager/ssl/src/md4.h
+++ b/security/manager/ssl/src/md4.h
@@ -5,17 +5,17 @@
 
 #ifndef md4_h__
 #define md4_h__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 /**
  * md4sum - computes the MD4 sum over the input buffer per RFC 1320
  * 
  * @param input
  *        buffer containing input data
  * @param inputLen
  *        length of input buffer (number of bytes)
--- a/security/manager/tools/getHSTSPreloadList.js
+++ b/security/manager/tools/getHSTSPreloadList.js
@@ -45,17 +45,17 @@ const HEADER = "/* This Source Code Form
 " * License, v. 2.0. If a copy of the MPL was not distributed with this\n" +
 " * file, You can obtain one at http://mozilla.org/MPL/2.0/. */\n" +
 "\n" +
 "/*****************************************************************************/\n" +
 "/* This is an automatically generated file. If you're not                    */\n" +
 "/* nsStrictTransportSecurityService.cpp, you shouldn't be #including it.     */\n" +
 "/*****************************************************************************/\n" +
 "\n" +
-"#include \"mozilla/StandardInteger.h\"\n";
+"#include <stdint.h>\n";
 const PREFIX = "\n" +
 "class nsSTSPreload\n" +
 "{\n" +
 "  public:\n" +
 "    const char *mHost;\n" +
 "    const bool mIncludeSubdomains;\n" +
 "};\n" +
 "\n" +
--- a/toolkit/components/mediasniffer/mp3sniff.h
+++ b/toolkit/components/mediasniffer/mp3sniff.h
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include <mozilla/StandardInteger.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 int mp3_sniff(const uint8_t *buf, long length);
 
 #ifdef __cplusplus
--- a/toolkit/mozapps/update/updater/bspatch.h
+++ b/toolkit/mozapps/update/updater/bspatch.h
@@ -27,17 +27,17 @@
  * 2005-04-26 - Define the header as a C structure, add a CRC32 checksum to
  *              the header, and make all the types 32-bit.
  *                --Benjamin Smedberg <benjamin@smedbergs.us>
  */
 
 #ifndef bspatch_h__
 #define bspatch_h__
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <stdio.h>
 
 typedef struct MBSPatchHeader_ {
   /* "MBDIFF10" */
   char tag[8];
   
   /* Length of the file to be patched */
   uint32_t slen;
--- a/toolkit/xre/MacLaunchHelper.h
+++ b/toolkit/xre/MacLaunchHelper.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MacLaunchHelper_h_
 #define MacLaunchHelper_h_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #include <unistd.h>
 
 extern "C" {
   void LaunchChildMac(int aArgc, char** aArgv, uint32_t aRestartType = 0,
                       pid_t *pid = 0);
 }
 
--- a/toolkit/xre/nsWindowsDllInterceptor.h
+++ b/toolkit/xre/nsWindowsDllInterceptor.h
@@ -55,17 +55,17 @@
  * patched again to jump directly to the trampoline instead of going through
  * the hook function. As such, re-intercepting the same function won't work, as
  * jump instructions are not supported.
  *
  * Note that this is not thread-safe.  Sad day.
  *
  */
 
-#include <mozilla/StandardInteger.h>
+#include <stdint.h>
 
 namespace mozilla {
 namespace internal {
 
 class WindowsDllNopSpacePatcher
 {
   typedef unsigned char *byteptr_t;
   HMODULE mModule;
--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef PROFILER_FUNCS_H
 #define PROFILER_FUNCS_H
 
 #include "mozilla/NullPtr.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/TimeStamp.h"
 #include "jsfriendapi.h"
 
 using mozilla::TimeStamp;
 using mozilla::TimeDuration;
 
 // Returns a handle to pass on exit. This can check that we are popping the
 // correct callstack.
--- a/tools/profiler/PseudoStack.h
+++ b/tools/profiler/PseudoStack.h
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef PROFILER_PSEUDO_STACK_H_
 #define PROFILER_PSEUDO_STACK_H_
 
 #include "mozilla/NullPtr.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "jsfriendapi.h"
 #include <stdlib.h>
 #include <algorithm>
 
 /* we duplicate this code here to avoid header dependencies
  * which make it more difficult to include in other places */
 #if defined(_M_X64) || defined(__x86_64__)
 #define V8_HOST_ARCH_X64 1
--- a/tools/profiler/UnwinderThread2.cpp
+++ b/tools/profiler/UnwinderThread2.cpp
@@ -17,17 +17,17 @@
 # define VALGRIND_HG_MUTEX_LOCK_POST(_mx)        /* */
 # define VALGRIND_HG_MUTEX_UNLOCK_PRE(_mx)       /* */
 # define VALGRIND_HG_MUTEX_UNLOCK_POST(_mx)      /* */
 # define VALGRIND_MAKE_MEM_DEFINED(_addr,_len)   ((void)0)
 # define VALGRIND_MAKE_MEM_UNDEFINED(_addr,_len) ((void)0)
 #endif
 
 #include "mozilla/arm.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "PlatformMacros.h"
 
 #include "platform.h"
 #include <ostream>
 
 #include "ProfileEntry.h"
 #include "UnwinderThread2.h"
 
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -34,17 +34,17 @@
 #else
 #define __android_log_print(a, ...)
 #endif
 
 #ifdef XP_UNIX
 #include <pthread.h>
 #endif
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Mutex.h"
 #include "PlatformMacros.h"
 #include "v8-support.h"
 #include <vector>
 
--- a/tools/profiler/shared-libraries.h
+++ b/tools/profiler/shared-libraries.h
@@ -10,17 +10,17 @@
 #ifndef MOZ_ENABLE_PROFILER_SPS
 #error This header does not have a useful implementation on your platform!
 #endif
 
 #include <algorithm>
 #include <vector>
 #include <string>
 #include <stdlib.h>
-#include <mozilla/StandardInteger.h>
+#include <stdint.h>
 #include <nsID.h>
 
 class SharedLibrary {
 public:
 
   SharedLibrary(uintptr_t aStart,
                 uintptr_t aEnd,
                 uintptr_t aOffset,
--- a/tools/trace-malloc/lib/nsTraceMalloc.h
+++ b/tools/trace-malloc/lib/nsTraceMalloc.h
@@ -1,18 +1,17 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef nsTraceMalloc_h___
 #define nsTraceMalloc_h___
 
-#include "mozilla/StandardInteger.h"
-
+#include <stdint.h>
 #include <stdio.h> /* for FILE */
 #include "prtypes.h"
 
 #ifdef XP_WIN
 #define setlinebuf(stream) setvbuf((stream), (char *)NULL, _IOLBF, 0)
 #endif
 
 #ifdef __cplusplus
--- a/tools/trace-malloc/lib/nsTraceMallocCallbacks.h
+++ b/tools/trace-malloc/lib/nsTraceMallocCallbacks.h
@@ -4,17 +4,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* declarations needed by both nsTraceMalloc.c and nsWinTraceMalloc.cpp */
 
 #ifndef NSTRACEMALLOCCALLBACKS_H
 #define NSTRACEMALLOCCALLBACKS_H
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Used by backtrace. */
 typedef struct stack_buffer_info {
--- a/tools/trace-malloc/spacetrace.h
+++ b/tools/trace-malloc/spacetrace.h
@@ -12,17 +12,17 @@
 **
 ** SpaceTrace is meant to take the output of trace-malloc and present
 **   a picture of allocations over the run of the application.
 */
 
 /*
 ** Required includes.
 */
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nspr.h"
 #include "prlock.h"
 #include "prrwlock.h"
 #include "nsTraceMalloc.h"
 #include "tmreader.h"
 #include "formdata.h"
 
 /*
--- a/widget/cocoa/nsCocoaFeatures.h
+++ b/widget/cocoa/nsCocoaFeatures.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsCocoaFeatures_h_
 #define nsCocoaFeatures_h_
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsCocoaFeatures {
 public:
   static int32_t OSXVersion();
   static bool OnLionOrLater();
   static bool OnMountainLionOrLater();
   static bool SupportCoreAnimationPlugins();
 
--- a/widget/nsEvent.h
+++ b/widget/nsEvent.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsEvent_h__
 #define nsEvent_h__
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.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
  * header files that are totally unnecessary.
  */
 
 enum UIStateChangeType {
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -123,32 +123,32 @@
 #include "nsICycleCollectorListener.h"
 #include "nsIMemoryReporter.h"
 #include "nsIFile.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsMemoryInfoDumper.h"
 #include "xpcpublic.h"
 #include "nsXPCOMPrivate.h"
 #include "GeckoProfiler.h"
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #ifdef WIN32
 #include <io.h>
 #include <process.h>
 #endif
 
 #ifdef XP_WIN
 #include <windows.h>
 #endif
 
 #include "mozilla/CondVar.h"
 #include "mozilla/Likely.h"
 #include "mozilla/mozPoisonWrite.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Telemetry.h"
 
 using namespace mozilla;
 
 //#define COLLECT_TIME_DEBUG
 
 // Enable assertions that are useful for diagnosing errors in graph construction.
 //#define DEBUG_CC_GRAPH
--- a/xpcom/base/nsError.h
+++ b/xpcom/base/nsError.h
@@ -2,19 +2,20 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsError_h__
 #define nsError_h__
 
 #include "mozilla/Likely.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/TypedEnum.h"
 
+#include <stdint.h>
+
 /*
  * To add error code to your module, you need to do the following:
  *
  * 1) Add a module offset code.  Add yours to the bottom of the list
  *    right below this comment, adding 1.
  *
  * 2) In your module, define a header file which uses one of the
  *    NE_ERROR_GENERATExxxxxx macros.  Some examples below:
--- a/xpcom/base/nsStackWalk.h
+++ b/xpcom/base/nsStackWalk.h
@@ -6,17 +6,17 @@
 /* API for getting a stack trace of the C/C++ stack on the current thread */
 
 #ifndef nsStackWalk_h_
 #define nsStackWalk_h_
 
 /* WARNING: This file is intended to be included from C or C++ files. */
 
 #include "nscore.h"
-#include <mozilla/StandardInteger.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 // aSP will be the best approximation possible of what the stack pointer will be
 // pointing to when the execution returns to executing that at that PC.
 // If no approximation can be made it will be NULL.
--- a/xpcom/base/nscore.h
+++ b/xpcom/base/nscore.h
@@ -18,18 +18,18 @@
 #if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
 #  include "mozilla/mozalloc.h"
 #  include "mozilla/mozalloc_macro_wrappers.h"
 #endif
 
 /**
  * Incorporate the integer data types which XPCOM uses.
  */
-#include "mozilla/StandardInteger.h"
-#include "stddef.h"
+#include <stddef.h>
+#include <stdint.h>
 
 #include "mozilla/NullPtr.h"
 
 /* Core XPCOM declarations. */
 
 /*----------------------------------------------------------------------*/
 /* Import/export defines */
 
--- a/xpcom/build/nsXREAppData.h
+++ b/xpcom/build/nsXREAppData.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsXREAppData_h
 #define nsXREAppData_h
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 class nsIFile;
 
 /**
  * Application-specific data needed to start the apprunner.
  *
  * @note When this structure is allocated and manipulated by XRE_CreateAppData,
  *       string fields will be allocated with NS_Alloc, and interface pointers
--- a/xpcom/ds/nsCheapSets.h
+++ b/xpcom/ds/nsCheapSets.h
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef __nsCheapSets_h__
 #define __nsCheapSets_h__
 
 #include "nsTHashtable.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 /**
  * A set that takes up minimal size when there are 0 or 1 entries in the set.
  * Use for cases where sizes of 0 and 1 are even slightly common.
  */
 template<typename EntryType>
 class nsCheapSet
 {
--- a/xpcom/glue/nsTArrayForwardDeclare.h
+++ b/xpcom/glue/nsTArrayForwardDeclare.h
@@ -14,17 +14,17 @@
 // Including this header is preferable to writing
 //
 //   template<class E> class nsTArray;
 //
 // yourself, since this header gives us flexibility to e.g. change the default
 // template parameters.
 //
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 template<class E>
 class nsTArray;
 
 template<class E>
 class FallibleTArray;
 
 template<class E, uint32_t N>
--- a/xpcom/glue/nsVersionComparator.cpp
+++ b/xpcom/glue/nsVersionComparator.cpp
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsVersionComparator.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include <mozilla/StandardInteger.h>
+#include <stdint.h>
 #if defined(XP_WIN) && !defined(UPDATER_NO_STRING_GLUE_STL)
 #include <wchar.h>
 #include "nsStringGlue.h"
 #endif
 
 struct VersionPart {
   int32_t     numA;
 
--- a/xpcom/glue/nsVoidArray.h
+++ b/xpcom/glue/nsVoidArray.h
@@ -5,17 +5,17 @@
 #ifndef nsVoidArray_h___
 #define nsVoidArray_h___
 
 //#define DEBUG_VOIDARRAY 1
 
 #include "nsDebug.h"
 
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 // Comparator callback function for sorting array values.
 typedef int (* nsVoidArrayComparatorFunc)
             (const void* aElement1, const void* aElement2, void* aData);
 
 // Enumerator callback function. Return false to stop
 typedef bool (* nsVoidArrayEnumFunc)(void* aElement, void *aData);
 typedef bool (* nsVoidArrayEnumFuncConst)(const void* aElement, void *aData);
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
@@ -6,17 +6,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* This code is for MIPS using the O32 ABI. */
 
 /* Platform specific code to invoke XPCOM methods on native objects */
 
 #include "xptcprivate.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 extern "C" uint32_t
 invoke_count_words(uint32_t paramCount, nsXPTCVariant* s)
 {
     // Count a word for a0 even though it's never stored or loaded
     // We do this only for alignment of register pairs.
     uint32_t result = 1;
     for (uint32_t i = 0; i < paramCount; i++, result++, s++)
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp
@@ -3,17 +3,17 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "xptcprivate.h"
 #include "xptiprivate.h"
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 /*
  * This is for MIPS O32 ABI
  * Args contains a0-3 and then the stack.
  * Because a0 is 'this', we want to skip it
  */
 extern "C" nsresult
 PrepareAndDispatch(nsXPTCStubBase* self, uint32_t methodIndex, uint32_t* args)
--- a/xpcom/tests/TestPRIntN.cpp
+++ b/xpcom/tests/TestPRIntN.cpp
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
  
 #include "prtypes.h"
 
 // This test is NOT intended to be run.  It's a test to make sure
 // PRInt{N} matches int{N}_t. If they don't match, we should get a
 // compiler warning or error in main().
 
 static void
--- a/xpcom/typelib/xpt/public/xpt_arena.h
+++ b/xpcom/typelib/xpt/public/xpt_arena.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef __xpt_arena_h__
 #define __xpt_arena_h__
 
 #include "prtypes.h"
 #include <stdlib.h>
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 
 /*
  * The XPT library is statically linked: no functions are exported from
  * shared libraries.
  */
 #define XPT_PUBLIC_API(t)    t
 #define XPT_PUBLIC_DATA(t)   t
--- a/xpcom/typelib/xpt/public/xpt_struct.h
+++ b/xpcom/typelib/xpt/public/xpt_struct.h
@@ -7,17 +7,17 @@
  * Structures matching the in-memory representation of typelib structures.
  * http://www.mozilla.org/scriptable/typelib_file.html
  */
 
 #ifndef __xpt_struct_h__
 #define __xpt_struct_h__
 
 #include "xpt_arena.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
  * Originally, I was going to have structures that exactly matched the on-disk
  * representation, but that proved difficult: different compilers can pack