--- CMakeLists.txt.orig	2019-03-07 12:46:25.000000000 -0700
+++ CMakeLists.txt	2019-06-05 13:36:31.931824154 -0600
@@ -13,10 +13,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMA
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-# Include drat-trim as a library
-add_library(drat-trim STATIC third-party/drat-trim/drat-trim.c)
-set_property(TARGET drat-trim PROPERTY POSITION_INDEPENDENT_CODE ON)
-
 # Build library for the main executable 
 add_library(lib_drat2er STATIC 
 	src/formula.cc
@@ -45,19 +41,9 @@ add_library(lib_drat2er STATIC
 set_target_properties(lib_drat2er PROPERTIES OUTPUT_NAME drat2er POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(lib_drat2er drat-trim)
 
-# Include the CLI11 command line parsing library
-set(CLI11_INCLUDE_DIR third-party/cli11)
-add_library(cli11 INTERFACE)
-target_include_directories(cli11 INTERFACE ${CLI11_INCLUDE_DIR})
-
 # Build the executable for the main program
 add_executable(drat2er src/main.cc)
-target_link_libraries(drat2er lib_drat2er cli11)
-
-# Build the executable for the unit tests
-set(CATCH_INCLUDE_DIR third-party/catch2)
-add_library(catch INTERFACE)
-target_include_directories(catch INTERFACE ${CATCH_INCLUDE_DIR})
+target_link_libraries(drat2er lib_drat2er)
 
 set(TEST_DIRECTORY test) 
 set(TEST_SOURCES ${TEST_DIRECTORY}/tests_main.cc
@@ -69,13 +55,13 @@ set(TEST_SOURCES ${TEST_DIRECTORY}/tests
 				 ${TEST_DIRECTORY}/test_rat_eliminator.cc
 				 ${TEST_DIRECTORY}/test_instruction_serialization.cc)
 add_executable(unit_tests ${TEST_SOURCES})
-target_link_libraries(unit_tests catch lib_drat2er)
+target_link_libraries(unit_tests lib_drat2er)
 
 # Enable Unit testing
 enable_testing()
 add_test(NAME UnitTests COMMAND unit_tests)
 
-install(TARGETS drat2er lib_drat2er drat-trim
+install(TARGETS drat2er lib_drat2er
         RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
         ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 install(FILES include/drat2er.h include/drat_trim_interface.h include/drat2er_options.h
--- src/drat_trim_interface.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ src/drat_trim_interface.cc	2019-06-05 12:38:48.431579450 -0600
@@ -31,7 +31,7 @@ using std::vector;
 
 extern "C" 
 {
-  int run_drat_trim (int argc, char** argv);
+#include <drat-trim.h>
 }
 
 namespace drat2er
--- src/main.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ src/main.cc	2019-06-05 13:27:16.385906870 -0600
@@ -26,7 +26,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "CLI11.hpp"
+#include <CLI/CLI.hpp>
 
 using std::string;
 using std::make_shared;
--- test/test_clause.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/test_clause.cc	2019-06-05 12:38:48.445579217 -0600
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <vector>
 #include "clause.h"
 
--- test/test_formula.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/test_formula.cc	2019-06-05 12:38:48.446579201 -0600
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <vector>
 #include <unordered_set>
 #include <algorithm>
--- test/test_instruction_serialization.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/test_instruction_serialization.cc	2019-06-05 12:38:48.447579184 -0600
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <vector>
 #include "instruction_serialization.h"
 #include "clause.h"
--- test/test_lrat_parser.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/test_lrat_parser.cc	2019-06-05 12:38:48.447579184 -0600
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <vector>
 #include "lrat_parser.h"
 #include "rat_clause.h"
--- test/test_rat_clause.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/test_rat_clause.cc	2019-06-05 12:38:48.448579168 -0600
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <vector>
 #include <map>
 #include "rat_clause.h"
--- test/test_rat_eliminator.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/test_rat_eliminator.cc	2019-06-05 12:38:48.448579168 -0600
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <vector>
 #include "rat_eliminator.h"
 #include "rat_clause.h"
--- test/test_rup_clause.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/test_rup_clause.cc	2019-06-05 12:38:48.449579151 -0600
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <vector>
 #include "rup_clause.h"
 
--- test/tests_main.cc.orig	2019-03-07 12:46:25.000000000 -0700
+++ test/tests_main.cc	2019-06-05 12:38:48.449579151 -0600
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include <catch2/catch.hpp>