diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8a4f55..6685d6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,16 +48,12 @@ CHECK_TYPE_SIZE(_Bool   _BOOL)
 # generate the configuration file
 configure_file("${PROJECT_SOURCE_DIR}/config.h.cmake" "${PROJECT_BINARY_DIR}/config.h")
 
-include_directories(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/3rdparty ${PROJECT_BINARY_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/3rdparty ${PROJECT_BINARY_DIR})
 
-# link_directories(${LINK_DIRECTORIES} /opt/local/lib)
 find_package(PCRE REQUIRED)
-# find_package(Judy REQUIRED)
 
-# set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} r3)
-set(LIBS ${LIBS} ${PCRE_LIBRARIES} r3)
+set(LIBS ${PCRE_LIBRARIES} r3)
 
-# set (CMAKE_CXX_FLAGS "-std=c++0x -arch x86_64 -stdlib=libc++ -g3 -Wall -O0")
 enable_testing()
 
 add_subdirectory(3rdparty)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ea9dba..dd9a47b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,8 @@
-include_directories("${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/3rdparty ${PROJECT_SOURCE_DIR}")
-# install(TARGETS swiftnav-static DESTINATION lib${LIB_SUFFIX})
-find_package(PCRE REQUIRED)
-set(libr3_SRCS node.c edge.c list.c slug.c str.c token.c match_entry.c memory.c)
-set(LIBS ${LIBS} ${PCRE_LIBRARIES} r3)
+include_directories("${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/3rdparty ${PROJECT_SOURCE_DIR}")
+set(SOURCES node.c edge.c str.c token.c match_entry.c slug.c memory.c)
+set(LIBS ${LIBS} ${PCRE_LIBRARIES})
 
-add_library(r3 STATIC ${libr3_SRCS})
-target_link_libraries(r3 lib3rdparty pcre)
+add_library(r3 STATIC ${SOURCES})
+
+install(TARGETS r3 DESTINATION lib)
 # install(FILES ${libswiftnav_HEADERS} DESTINATION include/libswiftnav)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 804f5d6..3e7013c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,7 +12,7 @@ else (NOT CHECK_FOUND)
     include_directories(${CHECK_INCLUDE_DIRS})
     # include_directories("${PROJECT_SOURCE_DIR}/include/r2")
     add_executable(check_tree check_tree.c)
-    target_link_libraries(check_tree ${TEST_LIBS})
+    target_link_libraries(check_tree ${TEST_LIBS} ${CHECK_LDFLAGS_OTHER})
 
     add_custom_command(
         TARGET check_tree POST_BUILD
diff --git a/tests/check_tree.c b/tests/check_tree.c
index bc351a7..c5a52fb 100644
--- a/tests/check_tree.c
+++ b/tests/check_tree.c
@@ -7,7 +7,7 @@
 #include "r3_slug.h"
 #include "zmalloc.h"
 #include "bench.h"
-#include "r3_debug.h"
+#include "../src/r3_debug.h"
 
 #define SAFE_FREE(ptr) if(ptr) free(ptr);