diff --git a/CMakeLists.txt b/CMakeLists.txt
index 765120b..50d6e31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,8 @@ option(P2T_BUILD_TESTS "Build tests" OFF)
 option(P2T_BUILD_TESTBED "Build the testbed application" OFF)
 
 file(GLOB SOURCES poly2tri/common/*.cc poly2tri/sweep/*.cc)
-add_library(poly2tri ${SOURCES})
+file(GLOB HEADERS poly2tri/*.h poly2tri/common/*.h poly2tri/sweep/*.h)
+add_library(poly2tri ${SOURCES} ${HEADERS})
 target_include_directories(poly2tri INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(P2T_BUILD_TESTS)
diff --git a/testbed/main.cc b/testbed/main.cc
index b18d89a..37f2f40 100644
--- a/testbed/main.cc
+++ b/testbed/main.cc
@@ -28,18 +28,22 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <cstdlib>
-#include <GLFW/glfw3.h>
-#include <time.h>
-#include <fstream>
-#include <string>
-#include <sstream>
-#include <algorithm>
-#include <iterator>
-#include <iostream>
-using namespace std;
+#include <poly2tri/poly2tri.h>
 
-#include "../poly2tri/poly2tri.h"
+#include <GLFW/glfw3.h>
+
+#include <algorithm>
+#include <cstdlib>
+#include <ctime>
+#include <fstream>
+#include <iostream>
+#include <iterator>
+#include <list>
+#include <sstream>
+#include <string>
+#include <vector>
+
+using namespace std;
 using namespace p2t;
 
 void Init();
diff --git a/unittest/main.cpp b/unittest/main.cpp
index 14ad9c3..be1a8c3 100644
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -3,9 +3,11 @@
 #endif
 #define BOOST_TEST_MODULE Poly2triTest
 
+#include <poly2tri/poly2tri.h>
+
 #include <boost/filesystem/path.hpp>
 #include <boost/test/unit_test.hpp>
-#include <poly2tri/poly2tri.h>
+
 #include <fstream>
 #include <iostream>
 #include <iterator>