diff -ruN clucene-core-2.3.3.4-orig/src/core/libclucene-core.pc.cmake clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
--- clucene-core-2.3.3.4-orig/src/core/libclucene-core.pc.cmake	2011-03-16 19:21:07.000000000 -0500
+++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake	2020-11-15 21:59:25.000000000 -0600
@@ -1,11 +1,11 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}/bin
 libdir=${prefix}/@LIB_DESTINATION@
-includedir=${prefix}/include:${prefix}/include/CLucene/ext
+includedir=${prefix}/include
 
 Name: libclucene
 Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
 Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
+Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
+Cflags: -I${prefix}/include
 ~
diff -ruN clucene-core-2.3.3.4-orig/src/ext/CMakeLists.txt clucene-core-2.3.3.4/src/ext/CMakeLists.txt
--- clucene-core-2.3.3.4-orig/src/ext/CMakeLists.txt	2011-03-16 19:21:07.000000000 -0500
+++ clucene-core-2.3.3.4/src/ext/CMakeLists.txt	2020-11-15 21:59:25.000000000 -0600
@@ -8,8 +8,5 @@
 	get_filename_component(aname ${file} NAME)
 	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/ext/boost ${apath})
 	
-	install(FILES ${file} 
-	       DESTINATION "include/CLucene/ext/boost/${relpath}"
-               COMPONENT development)
 ENDFOREACH(file)
 
diff -ruN clucene-core-2.3.3.4-orig/src/shared/CLucene/LuceneThreads.h clucene-core-2.3.3.4/src/shared/CLucene/LuceneThreads.h
--- clucene-core-2.3.3.4-orig/src/shared/CLucene/LuceneThreads.h	2011-03-16 19:21:07.000000000 -0500
+++ clucene-core-2.3.3.4/src/shared/CLucene/LuceneThreads.h	2020-11-15 21:59:38.000000000 -0600
@@ -7,6 +7,9 @@
 #ifndef _LuceneThreads_h
 #define  _LuceneThreads_h
 
+#if defined(_CL_HAVE_PTHREAD)
+	#include <pthread.h>
+#endif
 
 CL_NS_DEF(util)
 class CLuceneThreadIdCompare;
diff -ruN clucene-core-2.3.3.4-orig/src/shared/CMakeLists.txt clucene-core-2.3.3.4/src/shared/CMakeLists.txt
--- clucene-core-2.3.3.4-orig/src/shared/CMakeLists.txt	2011-03-16 19:21:07.000000000 -0500
+++ clucene-core-2.3.3.4/src/shared/CMakeLists.txt	2020-11-15 21:58:02.000000000 -0600
@@ -42,7 +42,7 @@
 find_package(ZLIB)
 IF ( ZLIB_FOUND )
   SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} )
-ELSEIF ( ZLIB_FOUND )
+ELSE ( ZLIB_FOUND )
   MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" )
   SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib )
   SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR})
diff -ruN clucene-core-2.3.3.4-orig/src/test/search/TestIndexSearcher.cpp clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp
--- clucene-core-2.3.3.4-orig/src/test/search/TestIndexSearcher.cpp	2011-03-16 19:21:07.000000000 -0500
+++ clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp	2020-11-15 22:21:26.000000000 -0600
@@ -5,6 +5,7 @@
 * the GNU Lesser General Public License, as specified in the COPYING file.
 ------------------------------------------------------------------------------*/
 #include "test.h"
+#include <unistd.h>
 
 DEFINE_MUTEX(searchMutex);
 DEFINE_CONDITION(searchCondition);