11 files changed, 11 insertions, 100 deletions
diff --git a/plugins/SpellChecker/src/hunspell/affentry.cxx b/plugins/SpellChecker/src/hunspell/affentry.cxx
index fef0cca5f5..6406f2577a 100644
--- a/plugins/SpellChecker/src/hunspell/affentry.cxx
+++ b/plugins/SpellChecker/src/hunspell/affentry.cxx
@@ -1,13 +1,4 @@
-#include "license.hunspell"
-#include "license.myspell"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "affentry.hxx"
-#include "csutil.hxx"
+#include "..\commons.h"
 
 PfxEntry::PfxEntry(AffixMgr* pmgr, affentry* dp)
 {
diff --git a/plugins/SpellChecker/src/hunspell/affixmgr.cxx b/plugins/SpellChecker/src/hunspell/affixmgr.cxx
index ae72f70270..59313bfba0 100644
--- a/plugins/SpellChecker/src/hunspell/affixmgr.cxx
+++ b/plugins/SpellChecker/src/hunspell/affixmgr.cxx
@@ -1,18 +1,4 @@
-#include "license.hunspell"
-#include "license.myspell"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <vector>
-
-#include "affixmgr.hxx"
-#include "affentry.hxx"
-#include "langnum.hxx"
-
-#include "csutil.hxx"
+#include "..\commons.h"
 
 AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key) 
 {
diff --git a/plugins/SpellChecker/src/hunspell/csutil.cxx b/plugins/SpellChecker/src/hunspell/csutil.cxx
index 35154a73ed..7284f9cdfd 100644
--- a/plugins/SpellChecker/src/hunspell/csutil.cxx
+++ b/plugins/SpellChecker/src/hunspell/csutil.cxx
@@ -1,14 +1,4 @@
-#include "license.hunspell"
-#include "license.myspell"
-
-#include <stdlib.h> 
-#include <string.h>
-#include <stdio.h> 
-#include <ctype.h>
-
-#include "csutil.hxx"
-#include "atypes.hxx"
-#include "langnum.hxx"
+#include "..\commons.h"
 
 // Unicode character encoding information
 struct unicode_info {
diff --git a/plugins/SpellChecker/src/hunspell/dictmgr.cxx b/plugins/SpellChecker/src/hunspell/dictmgr.cxx
index b4a15b1a5b..5310053f76 100644
--- a/plugins/SpellChecker/src/hunspell/dictmgr.cxx
+++ b/plugins/SpellChecker/src/hunspell/dictmgr.cxx
@@ -1,10 +1,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#include "dictmgr.hxx"
+#include "..\commons.h"
 
 DictMgr::DictMgr(const char * dictpath, const char * etype) : numdict(0)
 {
diff --git a/plugins/SpellChecker/src/hunspell/filemgr.cxx b/plugins/SpellChecker/src/hunspell/filemgr.cxx
index 5fb82bcf80..bfd9554271 100644
--- a/plugins/SpellChecker/src/hunspell/filemgr.cxx
+++ b/plugins/SpellChecker/src/hunspell/filemgr.cxx
@@ -1,11 +1,4 @@
-#include "license.hunspell"
-#include "license.myspell"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "filemgr.hxx"
+#include "..\commons.h"
 
 int FileMgr::fail(const char * err, const char * par) {
     fprintf(stderr, err, par);
diff --git a/plugins/SpellChecker/src/hunspell/hashmgr.cxx b/plugins/SpellChecker/src/hunspell/hashmgr.cxx
index ea93b8787c..f150437ad6 100644
--- a/plugins/SpellChecker/src/hunspell/hashmgr.cxx
+++ b/plugins/SpellChecker/src/hunspell/hashmgr.cxx
@@ -1,14 +1,4 @@
-#include "license.hunspell"
-#include "license.myspell"
-
-#include <stdlib.h> 
-#include <string.h>
-#include <stdio.h> 
-#include <ctype.h>
-
-#include "hashmgr.hxx"
-#include "csutil.hxx"
-#include "atypes.hxx"
+#include "..\commons.h"
 
 // build a hash table from a munched word list
 
diff --git a/plugins/SpellChecker/src/hunspell/hunspell.cxx b/plugins/SpellChecker/src/hunspell/hunspell.cxx
index 6b35fb51e0..03f8cb42c8 100644
--- a/plugins/SpellChecker/src/hunspell/hunspell.cxx
+++ b/plugins/SpellChecker/src/hunspell/hunspell.cxx
@@ -1,16 +1,8 @@
-#include "license.hunspell"
-#include "license.myspell"
+#include "..\commons.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "hunspell.hxx"
-#include "hunspell.h"
 #ifndef MOZILLA_CLIENT
 #    include "config.h"
 #endif
-#include "csutil.hxx"
 
 Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
 {
diff --git a/plugins/SpellChecker/src/hunspell/hunzip.cxx b/plugins/SpellChecker/src/hunspell/hunzip.cxx
index b50599fa84..ecd8c7da77 100644
--- a/plugins/SpellChecker/src/hunspell/hunzip.cxx
+++ b/plugins/SpellChecker/src/hunspell/hunzip.cxx
@@ -1,8 +1,4 @@
-#include <stdlib.h> 
-#include <string.h>
-#include <stdio.h> 
-
-#include "hunzip.hxx"
+#include "..\commons.h"
 
 #define CODELEN  65536
 #define BASEBITREC 5000
diff --git a/plugins/SpellChecker/src/hunspell/phonet.cxx b/plugins/SpellChecker/src/hunspell/phonet.cxx
index 3a849b4444..6e2e56297f 100644
--- a/plugins/SpellChecker/src/hunspell/phonet.cxx
+++ b/plugins/SpellChecker/src/hunspell/phonet.cxx
@@ -27,13 +27,7 @@
                 Porting from Aspell to Hunspell using C-like structs
 */
 
-#include <stdlib.h> 
-#include <string.h>
-#include <stdio.h> 
-#include <ctype.h>
-
-#include "csutil.hxx"
-#include "phonet.hxx"
+#include "..\commons.h"
 
 void init_phonet_hash(phonetable & parms) 
   {
diff --git a/plugins/SpellChecker/src/hunspell/replist.cxx b/plugins/SpellChecker/src/hunspell/replist.cxx
index bc153733db..cf75a2868d 100644
--- a/plugins/SpellChecker/src/hunspell/replist.cxx
+++ b/plugins/SpellChecker/src/hunspell/replist.cxx
@@ -1,12 +1,4 @@
-#include "license.hunspell"
-#include "license.myspell"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "replist.hxx"
-#include "csutil.hxx"
+#include "..\commons.h"
 
 RepList::RepList(int n) {
     dat = (replentry **) malloc(sizeof(replentry *) * n);
diff --git a/plugins/SpellChecker/src/hunspell/suggestmgr.cxx b/plugins/SpellChecker/src/hunspell/suggestmgr.cxx
index d08b506b9f..1fdf20c881 100644
--- a/plugins/SpellChecker/src/hunspell/suggestmgr.cxx
+++ b/plugins/SpellChecker/src/hunspell/suggestmgr.cxx
@@ -1,14 +1,4 @@
-#include "license.hunspell"
-#include "license.myspell"
-
-#include <stdlib.h> 
-#include <string.h>
-#include <stdio.h> 
-#include <ctype.h>
-
-#include "suggestmgr.hxx"
-#include "htypes.hxx"
-#include "csutil.hxx"
+#include "..\commons.h"
 
 const w_char W_VLINE = { '\0', '|' };