diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h
index 6efdf1d6605c..d188d4b2e51d 100644
--- a/content/base/public/nsDOMFile.h
+++ b/content/base/public/nsDOMFile.h
@@ -58,7 +58,7 @@
 #include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
 
 #include "mozilla/GuardObjects.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 class nsIFile;
 class nsIInputStream;
diff --git a/content/base/src/nsDOMBlobBuilder.h b/content/base/src/nsDOMBlobBuilder.h
index 8aec1d4a6a04..49c691171983 100644
--- a/content/base/src/nsDOMBlobBuilder.h
+++ b/content/base/src/nsDOMBlobBuilder.h
@@ -41,7 +41,7 @@
 #include "nsDOMFile.h"
 #include "CheckedInt.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 using namespace mozilla;
 
diff --git a/content/media/VideoUtils.cpp b/content/media/VideoUtils.cpp
index 61357222b671..9146d76a4a18 100644
--- a/content/media/VideoUtils.cpp
+++ b/content/media/VideoUtils.cpp
@@ -39,7 +39,7 @@
 #include "nsMathUtils.h"
 #include "prtypes.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 // Converts from number of audio frames to microseconds, given the specified
 // audio rate.
diff --git a/content/media/nsBuiltinDecoderReader.cpp b/content/media/nsBuiltinDecoderReader.cpp
index 3c43ff93379b..7a54fadf21b7 100644
--- a/content/media/nsBuiltinDecoderReader.cpp
+++ b/content/media/nsBuiltinDecoderReader.cpp
@@ -46,7 +46,7 @@
 #include "VideoUtils.h"
 
 #include "mozilla/mozalloc.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 using namespace mozilla;
 using mozilla::layers::ImageContainer;
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index 3137791d2c99..af032c5b5d03 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -48,7 +48,7 @@
 #include "nsDeque.h"
 
 #include "mozilla/Preferences.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 
 using namespace mozilla;
diff --git a/content/media/ogg/nsOggCodecState.cpp b/content/media/ogg/nsOggCodecState.cpp
index 920c2a4cd1ae..eddcf3a17ff7 100644
--- a/content/media/ogg/nsOggCodecState.cpp
+++ b/content/media/ogg/nsOggCodecState.cpp
@@ -44,7 +44,7 @@
 #include "VideoUtils.h"
 #include "nsBuiltinDecoderReader.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gBuiltinDecoderLog;
diff --git a/content/media/ogg/nsOggCodecState.h b/content/media/ogg/nsOggCodecState.h
index c746ca2059a0..fcc6f842f870 100644
--- a/content/media/ogg/nsOggCodecState.h
+++ b/content/media/ogg/nsOggCodecState.h
@@ -51,7 +51,7 @@
 #include <nsClassHashtable.h>
 #include "VideoUtils.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 // Uncomment the following to validate that we're predicting the number
 // of Vorbis samples in each packet correctly.
diff --git a/content/media/wave/nsWaveReader.cpp b/content/media/wave/nsWaveReader.cpp
index 1c0b8690bfd3..4c6efaa28855 100644
--- a/content/media/wave/nsWaveReader.cpp
+++ b/content/media/wave/nsWaveReader.cpp
@@ -43,7 +43,7 @@
 #include "nsTimeRanges.h"
 #include "VideoUtils.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 using namespace mozilla;
 
diff --git a/content/media/webm/nsWebMReader.h b/content/media/webm/nsWebMReader.h
index 53a5b9ed5240..565d8ae05b94 100644
--- a/content/media/webm/nsWebMReader.h
+++ b/content/media/webm/nsWebMReader.h
@@ -39,7 +39,7 @@
 #if !defined(nsWebMReader_h_)
 #define nsWebMReader_h_
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "nsDeque.h"
 #include "nsBuiltinDecoderReader.h"
diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
index bc10885bb22b..7af3a5a88e6b 100644
--- a/gfx/2d/Types.h
+++ b/gfx/2d/Types.h
@@ -38,7 +38,7 @@
 #ifndef MOZILLA_GFX_TYPES_H_
 #define MOZILLA_GFX_TYPES_H_
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stddef.h>
 
diff --git a/gfx/thebes/gfxScriptItemizer.h b/gfx/thebes/gfxScriptItemizer.h
index 6ce5460060c5..371286bbdb7b 100644
--- a/gfx/thebes/gfxScriptItemizer.h
+++ b/gfx/thebes/gfxScriptItemizer.h
@@ -80,7 +80,7 @@
 #ifndef GFX_SCRIPTITEMIZER_H
 #define GFX_SCRIPTITEMIZER_H
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "prtypes.h"
 #include "harfbuzz/hb.h"
 #include "nsUnicodeScriptCodes.h"
diff --git a/gfx/thebes/woff.h b/gfx/thebes/woff.h
index 607cae4e4fb9..946c6f9e74cd 100644
--- a/gfx/thebes/woff.h
+++ b/gfx/thebes/woff.h
@@ -40,7 +40,7 @@
 
 /* API for the WOFF encoder and decoder */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stdio.h> /* only for FILE, needed for woffPrintStatus */
 
diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index 2335fd434c09..042e6b85e1e9 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -68,7 +68,7 @@
 #include "gfxContext.h"
 
 #include "mozilla/Preferences.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/ClearOnShutdown.h"
diff --git a/intl/unicharutil/src/nsUnicodePropertyData.cpp b/intl/unicharutil/src/nsUnicodePropertyData.cpp
index 20588cba33c0..dd8041e41d0d 100644
--- a/intl/unicharutil/src/nsUnicodePropertyData.cpp
+++ b/intl/unicharutil/src/nsUnicodePropertyData.cpp
@@ -74,7 +74,7 @@ for the Unicode Character Database (UCD) for Unicode 6.1.0.
  * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
  */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "harfbuzz/hb-common.h"
 
 static const PRUint32 sScriptCodeToTag[] = {
diff --git a/intl/unicharutil/tools/genUnicodePropertyData.pl b/intl/unicharutil/tools/genUnicodePropertyData.pl
index 1a9c0e155e31..d1407a753a1c 100644
--- a/intl/unicharutil/tools/genUnicodePropertyData.pl
+++ b/intl/unicharutil/tools/genUnicodePropertyData.pl
@@ -376,7 +376,7 @@ $versionInfo
  * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
  */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "harfbuzz/hb-common.h"
 
 __END
diff --git a/js/public/LegacyIntTypes.h b/js/public/LegacyIntTypes.h
index 2e7d7aea486e..6f6a37bc03e6 100644
--- a/js/public/LegacyIntTypes.h
+++ b/js/public/LegacyIntTypes.h
@@ -55,7 +55,7 @@
 #ifndef PROTYPES_H
 #define PROTYPES_H
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "js-config.h"
 
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 2472be6d75b2..27fb83d4ca0e 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -44,7 +44,7 @@
  * JavaScript API.
  */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 0fbe6b1162fb..364559aa3298 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "mozilla/GuardObjects.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "jscntxt.h"
 #include "jscompartment.h"
diff --git a/js/src/vm/ObjectImpl.h b/js/src/vm/ObjectImpl.h
index 6fb4d8915727..14b948b4f394 100644
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -9,7 +9,7 @@
 #define ObjectImpl_h___
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "jsfriendapi.h"
 #include "jsinfer.h"
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index f11982fa4d83..d87ebfa40458 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -39,7 +39,7 @@
 #ifndef Unicode_h__
 #define Unicode_h__
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "jspubtd.h"
 
diff --git a/js/src/yarr/PageBlock.h b/js/src/yarr/PageBlock.h
index 34ff55096f4b..145bb0a8d63a 100644
--- a/js/src/yarr/PageBlock.h
+++ b/js/src/yarr/PageBlock.h
@@ -30,7 +30,7 @@
 #ifndef PageBlock_h
 #define PageBlock_h
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stdlib.h>
 #include "assembler/wtf/Platform.h"
diff --git a/media/libcubeb/include/cubeb-stdint.h b/media/libcubeb/include/cubeb-stdint.h
index 13c8060f7351..87d1b19d4e2d 100644
--- a/media/libcubeb/include/cubeb-stdint.h
+++ b/media/libcubeb/include/cubeb-stdint.h
@@ -1 +1 @@
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
diff --git a/mfbt/StdInt.h b/mfbt/StandardInteger.h
similarity index 88%
rename from mfbt/StdInt.h
rename to mfbt/StandardInteger.h
index 82f0a1ec9ca2..344750a794ee 100644
--- a/mfbt/StdInt.h
+++ b/mfbt/StandardInteger.h
@@ -40,8 +40,8 @@
 
 /* Implements the C99 <stdint.h> interface for C and C++ code. */
 
-#ifndef mozilla_StdInt_h_
-#define mozilla_StdInt_h_
+#ifndef mozilla_StandardInteger_h_
+#define mozilla_StandardInteger_h_
 
 /*
  * The C99 standard header <stdint.h> exposes typedefs for common fixed-width
@@ -61,17 +61,18 @@
  *   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
-   /*
-    * Don't include <stdint.h>, because on some case-insensitive systems . is
-    * searched for headers before the standard include location.  :-(
-    */
-#  include <sys/../stdint.h>
+#  include <stdint.h>
 #endif
 
-#endif  /* mozilla_StdInt_h_ */
+#endif  /* mozilla_StandardInteger_h_ */
diff --git a/mfbt/Types.h b/mfbt/Types.h
index 7a1228906628..4a540392bb48 100644
--- a/mfbt/Types.h
+++ b/mfbt/Types.h
@@ -53,7 +53,7 @@
  * the right __STDC_*_MACRO has been defined for each).  These are all usable
  * throughout mfbt code, and throughout Mozilla code more generally.
  */
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 /* Also expose size_t. */
 #include <stddef.h>
diff --git a/mfbt/exported_headers.mk b/mfbt/exported_headers.mk
index 6ca31f33e246..1ca535712295 100644
--- a/mfbt/exported_headers.mk
+++ b/mfbt/exported_headers.mk
@@ -51,7 +51,7 @@ EXPORTS_mozilla += \
   MSStdInt.h \
   RangedPtr.h \
   RefPtr.h \
-  StdInt.h \
+  StandardInteger.h \
   Types.h \
   Util.h \
   $(NULL)
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
index 4d37ed0d05e9..376e2ff6b301 100644
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -8,7 +8,7 @@
 #define __android_log_print(a, ...)
 #endif
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"
diff --git a/tools/profiler/shared-libraries.h b/tools/profiler/shared-libraries.h
index 434206338403..47dad1e83e26 100644
--- a/tools/profiler/shared-libraries.h
+++ b/tools/profiler/shared-libraries.h
@@ -39,7 +39,7 @@
 #include <vector>
 #include <string.h>
 #include <stdlib.h>
-#include <mozilla/StdInt.h>
+#include <mozilla/StandardInteger.h>
 
 class SharedLibrary {
 public:
diff --git a/tools/trace-malloc/lib/nsTraceMalloc.h b/tools/trace-malloc/lib/nsTraceMalloc.h
index 52d5c5054484..6d0d89ebcbad 100644
--- a/tools/trace-malloc/lib/nsTraceMalloc.h
+++ b/tools/trace-malloc/lib/nsTraceMalloc.h
@@ -40,7 +40,7 @@
 #ifndef nsTraceMalloc_h___
 #define nsTraceMalloc_h___
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stdio.h> /* for FILE */
 #include "prtypes.h"
diff --git a/xpcom/base/nsStackWalk.h b/xpcom/base/nsStackWalk.h
index 293e4b59bbb5..15685fe71b53 100644
--- a/xpcom/base/nsStackWalk.h
+++ b/xpcom/base/nsStackWalk.h
@@ -43,7 +43,7 @@
 /* WARNING: This file is intended to be included from C or C++ files. */
 
 #include "nscore.h"
-#include <mozilla/StdInt.h>
+#include <mozilla/StandardInteger.h>
 
 PR_BEGIN_EXTERN_C
 
diff --git a/xpcom/build/nsXREAppData.h b/xpcom/build/nsXREAppData.h
index 96cf3fcced5d..84d4760d8879 100644
--- a/xpcom/build/nsXREAppData.h
+++ b/xpcom/build/nsXREAppData.h
@@ -40,7 +40,7 @@
 #ifndef nsXREAppData_h
 #define nsXREAppData_h
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 class nsILocalFile;
 
diff --git a/xpcom/ds/nsCheapSets.h b/xpcom/ds/nsCheapSets.h
index 914182207948..ccc58b760587 100644
--- a/xpcom/ds/nsCheapSets.h
+++ b/xpcom/ds/nsCheapSets.h
@@ -39,7 +39,7 @@
 #define __nsCheapSets_h__
 
 #include "nsTHashtable.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 /**
  * A set that takes up minimal size when there are 0 or 1 entries in the set.