diff --git a/autobuild.xml b/autobuild.xml
index 3fac0a0a8..96303e7b6 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2867,6 +2867,7 @@
                 <array>
                   <string>-G</string>
                   <string>'Unix Makefiles'</string>
+                  <string>-DWORD_SIZE:STRING=64</string>
                 </array>
               </map>
               <key>default</key>
@@ -2891,6 +2892,7 @@
                 <array>
                   <string>-G</string>
                   <string>'Unix Makefiles'</string>
+                  <string>-DWORD_SIZE:STRING=64</string>
                 </array>
               </map>
               <key>name</key>
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index ad96be61b..6cc325495 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -12,6 +12,7 @@ endif (DARWIN)
 
 
 set(LLCOMMON_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/cwdebug
     ${LIBS_OPEN_DIR}/llcommon
     ${APRUTIL_INCLUDE_DIR}
     ${APR_INCLUDE_DIR}
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 78f50e6e3..00c4b4109 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 project(llcommon)
 
+include(Cwdebug)
 include(00-Common)
 include(LLCommon)
 include(APR)
@@ -250,6 +251,8 @@ set(llcommon_HEADER_FILES
 set_source_files_properties(${llcommon_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
+list(APPEND llcommon_SOURCE_FILES ${cwdebug_SOURCE_FILES})
+
 list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
 
 if(NOT WORD_SIZE EQUAL 32)