diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp
index 7e74e9fe00e..770403a3488 100644
--- a/mozilla/layout/base/nsCaret.cpp
+++ b/mozilla/layout/base/nsCaret.cpp
@@ -65,6 +65,11 @@
 
 #include "nsCaret.h"
 
+// The bidi indicator hangs off the caret to one side, to show which
+// direction the typing is in. It needs to be at least 2x2 to avoid looking like 
+// an insignificant dot
+static const PRUint32 kMinBidiIndicatorPixels = 2;
+
 #if !defined(XP_UNIX) || defined(XP_MACOSX)
 // Because of drawing issues, we currently always make a new RC. See bug 28068
 // Before removing this, stuff will need to be fixed and tested on all platforms.
diff --git a/mozilla/layout/base/nsCaret.h b/mozilla/layout/base/nsCaret.h
index d00c9ef98d8..79c522325d8 100644
--- a/mozilla/layout/base/nsCaret.h
+++ b/mozilla/layout/base/nsCaret.h
@@ -112,7 +112,6 @@ protected:
 
     nscoord               mCaretTwipsWidth;   // caret width in twips. this gets calculated laziiy
     nscoord               mBidiIndicatorTwipsSize;   // width and height of bidi indicator
-    static const kMinBidiIndicatorPixels = 2;
 
     PRPackedBool          mVisible;           // is the caret blinking
     PRPackedBool          mDrawn;             // this should be mutable
diff --git a/mozilla/layout/base/src/nsCaret.cpp b/mozilla/layout/base/src/nsCaret.cpp
index 7e74e9fe00e..770403a3488 100644
--- a/mozilla/layout/base/src/nsCaret.cpp
+++ b/mozilla/layout/base/src/nsCaret.cpp
@@ -65,6 +65,11 @@
 
 #include "nsCaret.h"
 
+// The bidi indicator hangs off the caret to one side, to show which
+// direction the typing is in. It needs to be at least 2x2 to avoid looking like 
+// an insignificant dot
+static const PRUint32 kMinBidiIndicatorPixels = 2;
+
 #if !defined(XP_UNIX) || defined(XP_MACOSX)
 // Because of drawing issues, we currently always make a new RC. See bug 28068
 // Before removing this, stuff will need to be fixed and tested on all platforms.
diff --git a/mozilla/layout/base/src/nsCaret.h b/mozilla/layout/base/src/nsCaret.h
index d00c9ef98d8..79c522325d8 100644
--- a/mozilla/layout/base/src/nsCaret.h
+++ b/mozilla/layout/base/src/nsCaret.h
@@ -112,7 +112,6 @@ protected:
 
     nscoord               mCaretTwipsWidth;   // caret width in twips. this gets calculated laziiy
     nscoord               mBidiIndicatorTwipsSize;   // width and height of bidi indicator
-    static const kMinBidiIndicatorPixels = 2;
 
     PRPackedBool          mVisible;           // is the caret blinking
     PRPackedBool          mDrawn;             // this should be mutable