diff --git a/extensions/spellcheck/hunspell/src/affixmgr.cpp b/extensions/spellcheck/hunspell/src/affixmgr.cpp
index d27de9a516a..76e3d6cbcf7 100644
--- a/extensions/spellcheck/hunspell/src/affixmgr.cpp
+++ b/extensions/spellcheck/hunspell/src/affixmgr.cpp
@@ -68,10 +68,6 @@
 
 #include "csutil.hxx"
 
-#ifdef MOZILLA_CLIENT
-#include "nscore.h" // for mozalloc headers
-#endif
-
 AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key) 
 {
   // register hash manager and load affix data from aff file
diff --git a/extensions/spellcheck/hunspell/src/csutil.hxx b/extensions/spellcheck/hunspell/src/csutil.hxx
index 66e600e4d36..1a4f778151a 100644
--- a/extensions/spellcheck/hunspell/src/csutil.hxx
+++ b/extensions/spellcheck/hunspell/src/csutil.hxx
@@ -66,6 +66,10 @@
 #include "w_char.hxx"
 #include "htypes.hxx"
 
+#ifdef MOZILLA_CLIENT
+#include "nscore.h" // for mozalloc headers
+#endif
+
 // casing
 #define NOCAP   0
 #define INITCAP 1
diff --git a/extensions/spellcheck/hunspell/src/hunspell.cpp b/extensions/spellcheck/hunspell/src/hunspell.cpp
index bf51fc335b5..226207ccb55 100644
--- a/extensions/spellcheck/hunspell/src/hunspell.cpp
+++ b/extensions/spellcheck/hunspell/src/hunspell.cpp
@@ -61,9 +61,7 @@
 
 #include "hunspell.hxx"
 #include "hunspell.h"
-#ifdef MOZILLA_CLIENT
-#    include "nscore.h"
-#else
+#ifndef MOZILLA_CLIENT
 #    include "config.h"
 #endif
 #include "csutil.hxx"
diff --git a/extensions/spellcheck/hunspell/src/suggestmgr.cpp b/extensions/spellcheck/hunspell/src/suggestmgr.cpp
index ab0df7ac2c2..a03f6606b3c 100644
--- a/extensions/spellcheck/hunspell/src/suggestmgr.cpp
+++ b/extensions/spellcheck/hunspell/src/suggestmgr.cpp
@@ -64,10 +64,6 @@
 #include "htypes.hxx"
 #include "csutil.hxx"
 
-#ifdef MOZILLA_CLIENT
-#include "nscore.h" // for mozalloc headers
-#endif
-
 const w_char W_VLINE = { '\0', '|' };
 
 SuggestMgr::SuggestMgr(const char * tryme, int maxn,