diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 4fc4f82486..9342a22d46 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -62,7 +62,6 @@ set(llcommon_SOURCE_FILES
     llformat.cpp
     llframetimer.cpp
     llheartbeat.cpp
-    llhunspell.cpp
     llliveappconfig.cpp
     lllivefile.cpp
     lllog.cpp
@@ -172,7 +171,6 @@ set(llcommon_HEADER_FILES
     llhash.h
     llheartbeat.h
     llhttpstatuscodes.h
-    llhunspell.h
     llindexedqueue.h
     llinstancetracker.h
     llkeythrottle.h
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index f3b90f0388..ad57651751 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -48,6 +48,7 @@ set(llui_SOURCE_FILES
     llflyoutbutton.cpp 
     llfocusmgr.cpp
     llfunctorregistry.cpp
+    llhunspell.cpp
     lliconctrl.cpp
     llkeywords.cpp
     lllayoutstack.cpp
@@ -142,6 +143,7 @@ set(llui_HEADER_FILES
     llfunctorregistry.h
     llhandle.h
     llhelp.h
+    llhunspell.h
     lliconctrl.h
     llkeywords.h
     lllayoutstack.h
diff --git a/indra/llcommon/llhunspell.cpp b/indra/llui/llhunspell.cpp
similarity index 100%
rename from indra/llcommon/llhunspell.cpp
rename to indra/llui/llhunspell.cpp
diff --git a/indra/llcommon/llhunspell.h b/indra/llui/llhunspell.h
similarity index 95%
rename from indra/llcommon/llhunspell.h
rename to indra/llui/llhunspell.h
index ca93dfde84..ea959441a1 100644
--- a/indra/llcommon/llhunspell.h
+++ b/indra/llui/llhunspell.h
@@ -23,7 +23,7 @@ class Hunspell;
 
 // ============================================================================
 
-class LL_COMMON_API LLHunspellWrapper : public LLSingleton<LLHunspellWrapper>
+class LLHunspellWrapper : public LLSingleton<LLHunspellWrapper>
 {
 	friend class LLSingleton<LLHunspellWrapper>;
 protected: