diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 79674c5a0..2899d0712 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -56,7 +56,6 @@ set(llcommon_SOURCE_FILES
     llfile.cpp
     llfindlocale.cpp
     llfixedbuffer.cpp
-    llfoldertype.cpp
     llformat.cpp
     llframetimer.cpp
     llheartbeat.cpp
@@ -177,7 +176,6 @@ set(llcommon_HEADER_FILES
     llfile.h
     llfindlocale.h
     llfixedbuffer.h
-    llfoldertype.h
     llformat.h
     llframetimer.h
     llhandle.h
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
index afd5de34f..f288fa496 100644
--- a/indra/llinventory/CMakeLists.txt
+++ b/indra/llinventory/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(
 set(llinventory_SOURCE_FILES
     llcategory.cpp
     lleconomy.cpp
+    llfoldertype.cpp
     llinventory.cpp
     llinventorydefines.cpp
     llinventorytype.cpp
@@ -35,6 +36,7 @@ set(llinventory_HEADER_FILES
 
     llcategory.h
     lleconomy.h
+    llfoldertype.h
     llinventory.h
     llinventorydefines.h
     llinventorytype.h
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
similarity index 100%
rename from indra/llcommon/llfoldertype.cpp
rename to indra/llinventory/llfoldertype.cpp
diff --git a/indra/llcommon/llfoldertype.h b/indra/llinventory/llfoldertype.h
similarity index 98%
rename from indra/llcommon/llfoldertype.h
rename to indra/llinventory/llfoldertype.h
index 7e7cfa2b9..421c44fea 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llinventory/llfoldertype.h
@@ -39,7 +39,7 @@
 
 // This class handles folder types (similar to assettype, except for folders)
 // and operations on those.
-class LL_COMMON_API LLFolderType
+class LLFolderType
 {
 public:
 	// ! BACKWARDS COMPATIBILITY ! Folder type enums must match asset type enums.