diff --git a/mozilla/base/src/bufferRoutines.h b/mozilla/base/src/bufferRoutines.h
index 83d7e2b5b5d..e327f3bd09e 100644
--- a/mozilla/base/src/bufferRoutines.h
+++ b/mozilla/base/src/bufferRoutines.h
@@ -31,8 +31,6 @@
 
 #include "nsCRT.h"
 
-static const PRInt32 kNotFound=-1;
-
 inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
   return ((PRUnichar*)aString)[anIndex];
 }
diff --git a/mozilla/base/src/nsStr.h b/mozilla/base/src/nsStr.h
index 19d82773a81..a71e2bdedb0 100644
--- a/mozilla/base/src/nsStr.h
+++ b/mozilla/base/src/nsStr.h
@@ -52,6 +52,7 @@
 enum  eCharSize {eOneByte=0,eTwoByte=1};
 #define kDefaultCharSize eTwoByte
 
+static const PRInt32 kNotFound = -1;
 
 union UStrPtr { 
   char*       mCharBuf;
diff --git a/mozilla/base/src/nsString.cpp b/mozilla/base/src/nsString.cpp
index db4badc685d..13574863156 100644
--- a/mozilla/base/src/nsString.cpp
+++ b/mozilla/base/src/nsString.cpp
@@ -33,7 +33,6 @@
 #include "nsICaseConversion.h"
 
 const PRInt32 kGrowthDelta = 8;
-const PRInt32 kNotFound = -1;
 PRUnichar gBadChar = 0;
 const char* kOutOfBoundsError = "Error: out of bounds";
 const char* kNullPointerError = "Error: unexpected null ptr";
diff --git a/mozilla/base/src/nsString.h b/mozilla/base/src/nsString.h
index 9a14786a2fb..b9563285d61 100644
--- a/mozilla/base/src/nsString.h
+++ b/mozilla/base/src/nsString.h
@@ -40,6 +40,7 @@
 #include <iostream.h>
 #include <stdio.h>
 class nsISizeOfHandler;
+#include "nsStr.h"
 
 class NS_BASE nsString {
   public: 
diff --git a/mozilla/base/src/nsString2.cpp b/mozilla/base/src/nsString2.cpp
index 3fab06fd9f4..1cc31ede39e 100644
--- a/mozilla/base/src/nsString2.cpp
+++ b/mozilla/base/src/nsString2.cpp
@@ -36,7 +36,6 @@
 
 static const char* kNullPointerError = "Error: unexpected null ptr";
 static const char* kWhitespace="\b\t\r\n ";
-static const PRInt32  kNotFound=-1;
 
 #ifdef  RICKG_DEBUG
 PRBool nsString2::mSelfTested = PR_FALSE;   
diff --git a/mozilla/string/obsolete/nsStr.h b/mozilla/string/obsolete/nsStr.h
index 19d82773a81..a71e2bdedb0 100644
--- a/mozilla/string/obsolete/nsStr.h
+++ b/mozilla/string/obsolete/nsStr.h
@@ -52,6 +52,7 @@
 enum  eCharSize {eOneByte=0,eTwoByte=1};
 #define kDefaultCharSize eTwoByte
 
+static const PRInt32 kNotFound = -1;
 
 union UStrPtr { 
   char*       mCharBuf;
diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index db4badc685d..13574863156 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -33,7 +33,6 @@
 #include "nsICaseConversion.h"
 
 const PRInt32 kGrowthDelta = 8;
-const PRInt32 kNotFound = -1;
 PRUnichar gBadChar = 0;
 const char* kOutOfBoundsError = "Error: out of bounds";
 const char* kNullPointerError = "Error: unexpected null ptr";
diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index 9a14786a2fb..b9563285d61 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -40,6 +40,7 @@
 #include <iostream.h>
 #include <stdio.h>
 class nsISizeOfHandler;
+#include "nsStr.h"
 
 class NS_BASE nsString {
   public: 
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 3fab06fd9f4..1cc31ede39e 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -36,7 +36,6 @@
 
 static const char* kNullPointerError = "Error: unexpected null ptr";
 static const char* kWhitespace="\b\t\r\n ";
-static const PRInt32  kNotFound=-1;
 
 #ifdef  RICKG_DEBUG
 PRBool nsString2::mSelfTested = PR_FALSE;   
diff --git a/mozilla/xpcom/ds/bufferRoutines.h b/mozilla/xpcom/ds/bufferRoutines.h
index 83d7e2b5b5d..e327f3bd09e 100644
--- a/mozilla/xpcom/ds/bufferRoutines.h
+++ b/mozilla/xpcom/ds/bufferRoutines.h
@@ -31,8 +31,6 @@
 
 #include "nsCRT.h"
 
-static const PRInt32 kNotFound=-1;
-
 inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
   return ((PRUnichar*)aString)[anIndex];
 }
diff --git a/mozilla/xpcom/ds/nsStr.h b/mozilla/xpcom/ds/nsStr.h
index 19d82773a81..a71e2bdedb0 100644
--- a/mozilla/xpcom/ds/nsStr.h
+++ b/mozilla/xpcom/ds/nsStr.h
@@ -52,6 +52,7 @@
 enum  eCharSize {eOneByte=0,eTwoByte=1};
 #define kDefaultCharSize eTwoByte
 
+static const PRInt32 kNotFound = -1;
 
 union UStrPtr { 
   char*       mCharBuf;
diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index db4badc685d..13574863156 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/xpcom/ds/nsString.cpp
@@ -33,7 +33,6 @@
 #include "nsICaseConversion.h"
 
 const PRInt32 kGrowthDelta = 8;
-const PRInt32 kNotFound = -1;
 PRUnichar gBadChar = 0;
 const char* kOutOfBoundsError = "Error: out of bounds";
 const char* kNullPointerError = "Error: unexpected null ptr";
diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index 9a14786a2fb..b9563285d61 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/xpcom/ds/nsString.h
@@ -40,6 +40,7 @@
 #include <iostream.h>
 #include <stdio.h>
 class nsISizeOfHandler;
+#include "nsStr.h"
 
 class NS_BASE nsString {
   public: 
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index 3fab06fd9f4..1cc31ede39e 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -36,7 +36,6 @@
 
 static const char* kNullPointerError = "Error: unexpected null ptr";
 static const char* kWhitespace="\b\t\r\n ";
-static const PRInt32  kNotFound=-1;
 
 #ifdef  RICKG_DEBUG
 PRBool nsString2::mSelfTested = PR_FALSE;   
diff --git a/mozilla/xpcom/string/obsolete/nsStr.h b/mozilla/xpcom/string/obsolete/nsStr.h
index 19d82773a81..a71e2bdedb0 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.h
+++ b/mozilla/xpcom/string/obsolete/nsStr.h
@@ -52,6 +52,7 @@
 enum  eCharSize {eOneByte=0,eTwoByte=1};
 #define kDefaultCharSize eTwoByte
 
+static const PRInt32 kNotFound = -1;
 
 union UStrPtr { 
   char*       mCharBuf;
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index db4badc685d..13574863156 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -33,7 +33,6 @@
 #include "nsICaseConversion.h"
 
 const PRInt32 kGrowthDelta = 8;
-const PRInt32 kNotFound = -1;
 PRUnichar gBadChar = 0;
 const char* kOutOfBoundsError = "Error: out of bounds";
 const char* kNullPointerError = "Error: unexpected null ptr";
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index 9a14786a2fb..b9563285d61 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -40,6 +40,7 @@
 #include <iostream.h>
 #include <stdio.h>
 class nsISizeOfHandler;
+#include "nsStr.h"
 
 class NS_BASE nsString {
   public: 
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 3fab06fd9f4..1cc31ede39e 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -36,7 +36,6 @@
 
 static const char* kNullPointerError = "Error: unexpected null ptr";
 static const char* kWhitespace="\b\t\r\n ";
-static const PRInt32  kNotFound=-1;
 
 #ifdef  RICKG_DEBUG
 PRBool nsString2::mSelfTested = PR_FALSE;