diff --git a/include/xlnt/cell/cell_reference.hpp b/include/xlnt/cell/cell_reference.hpp
index 78e86d72..e9990cda 100644
--- a/include/xlnt/cell/cell_reference.hpp
+++ b/include/xlnt/cell/cell_reference.hpp
@@ -26,7 +26,7 @@
 #include <string>
 #include <utility>
 
-#include "../common/types.hpp"
+#include <xlnt/common/types.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/common/exceptions.hpp b/include/xlnt/common/exceptions.hpp
index 1c2e6bb2..d8c3ee36 100644
--- a/include/xlnt/common/exceptions.hpp
+++ b/include/xlnt/common/exceptions.hpp
@@ -25,7 +25,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "../common/types.hpp"
+#include <xlnt/common/types.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/common/zip_file.hpp b/include/xlnt/common/zip_file.hpp
index 7a3fab89..a5301438 100644
--- a/include/xlnt/common/zip_file.hpp
+++ b/include/xlnt/common/zip_file.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-// Note: this comes from https://github.com/tfussell/pyzip
+// Note: this comes from https://github.com/tfussell/miniz-cpp
 
 struct mz_zip_archive_tag;
 
diff --git a/include/xlnt/styles/style.hpp b/include/xlnt/styles/style.hpp
index 680f0b88..224afe6d 100644
--- a/include/xlnt/styles/style.hpp
+++ b/include/xlnt/styles/style.hpp
@@ -23,12 +23,12 @@
 // @author: see AUTHORS file
 #pragma once
 
-#include "alignment.hpp"
-#include "border.hpp"
-#include "fill.hpp"
-#include "font.hpp"
-#include "number_format.hpp"
-#include "protection.hpp"
+#include <xlnt/styles/alignment.hpp>
+#include <xlnt/styles/border.hpp>
+#include <xlnt/styles/fill.hpp>
+#include <xlnt/styles/font.hpp>
+#include <xlnt/styles/number_format.hpp>
+#include <xlnt/styles/protection.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/workbook/document_properties.hpp b/include/xlnt/workbook/document_properties.hpp
index e277b375..ed56a670 100644
--- a/include/xlnt/workbook/document_properties.hpp
+++ b/include/xlnt/workbook/document_properties.hpp
@@ -25,7 +25,7 @@
 
 #include <string>
 
-#include "../common/datetime.hpp"
+#include <xlnt/common/datetime.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/worksheet/cell_vector.hpp b/include/xlnt/worksheet/cell_vector.hpp
index 38bb2d31..9203aa27 100644
--- a/include/xlnt/worksheet/cell_vector.hpp
+++ b/include/xlnt/worksheet/cell_vector.hpp
@@ -2,10 +2,10 @@
 
 #include <iterator>
 
-#include "../cell/cell_reference.hpp"
-#include "range_reference.hpp"
-#include "major_order.hpp"
-#include "worksheet.hpp"
+#include <xlnt/cell/cell_reference.hpp>
+#include <xlnt/worksheet/range_reference.hpp>
+#include <xlnt/worksheet/major_order.hpp>
+#include <xlnt/worksheet/worksheet.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/worksheet/range.hpp b/include/xlnt/worksheet/range.hpp
index a4c6086c..9df9ee2b 100644
--- a/include/xlnt/worksheet/range.hpp
+++ b/include/xlnt/worksheet/range.hpp
@@ -27,10 +27,10 @@
 #include <string>
 #include <vector>
 
-#include "cell_vector.hpp"
-#include "major_order.hpp"
-#include "range_reference.hpp"
-#include "worksheet.hpp"
+#include <xlnt/worksheet/cell_vector.hpp>
+#include <xlnt/worksheet/major_order.hpp>
+#include <xlnt/worksheet/range_reference.hpp>
+#include <xlnt/worksheet/worksheet.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/worksheet/range_reference.hpp b/include/xlnt/worksheet/range_reference.hpp
index 98d43261..91360d93 100644
--- a/include/xlnt/worksheet/range_reference.hpp
+++ b/include/xlnt/worksheet/range_reference.hpp
@@ -22,7 +22,7 @@
 // @author: see AUTHORS file
 #pragma once
 
-#include "../cell/cell_reference.hpp"
+#include <xlnt/cell/cell_reference.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/worksheet/worksheet.hpp b/include/xlnt/worksheet/worksheet.hpp
index 1ef3df11..66a43b1f 100644
--- a/include/xlnt/worksheet/worksheet.hpp
+++ b/include/xlnt/worksheet/worksheet.hpp
@@ -29,9 +29,9 @@
 #include <unordered_map>
 #include <vector>
 
-#include "page_setup.hpp"
-#include "../common/types.hpp"
-#include "../common/relationship.hpp"
+#include <xlnt/common/types.hpp>
+#include <xlnt/common/relationship.hpp>
+#include <xlnt/worksheet/page_setup.hpp>
 
 namespace xlnt {
 
diff --git a/include/xlnt/xlnt.hpp b/include/xlnt/xlnt.hpp
index fa2b7ff0..7a7207a1 100644
--- a/include/xlnt/xlnt.hpp
+++ b/include/xlnt/xlnt.hpp
@@ -33,45 +33,45 @@ const std::string author_email = "thomas.fussell@gmail.com";
 const std::string url = "https://github.com/tfussell/xlnt";
 const std::string download_url = "https://github.com/tfussell/xlnt/archive/master.zip";
 
-#include "config.hpp"
+#include <xlnt/config.hpp>
 
-#include "cell/cell.hpp"
-#include "cell/cell_reference.hpp"
-#include "cell/comment.hpp"
-#include "common/datetime.hpp"
-#include "common/encoding.hpp"
-#include "common/exceptions.hpp"
-#include "common/relationship.hpp"
-#include "common/types.hpp"
-#include "common/zip_file.hpp"
-#include "styles/alignment.hpp"
-#include "styles/border.hpp"
-#include "styles/color.hpp"
-#include "styles/fill.hpp"
-#include "styles/font.hpp"
-#include "styles/named_style.hpp"
-#include "styles/number_format.hpp"
-#include "styles/protection.hpp"
-#include "styles/side.hpp"
-#include "styles/style.hpp"
-#include "workbook/document_properties.hpp"
-#include "workbook/document_security.hpp"
-#include "workbook/external_book.hpp"
-#include "workbook/manifest.hpp"
-#include "workbook/named_range.hpp"
-#include "workbook/theme.hpp"
-#include "workbook/workbook.hpp"
-#include "worksheet/cell_vector.hpp"
-#include "worksheet/column_properties.hpp"
-#include "worksheet/major_order.hpp"
-#include "worksheet/page_margins.hpp"
-#include "worksheet/page_setup.hpp"
-#include "worksheet/pane.hpp"
-#include "worksheet/range.hpp"
-#include "worksheet/range_reference.hpp"
-#include "worksheet/row_properties.hpp"
-#include "worksheet/selection.hpp"
-#include "worksheet/sheet_protection.hpp"
-#include "worksheet/sheet_view.hpp"
-#include "worksheet/worksheet_properties.hpp"
-#include "worksheet/worksheet.hpp"
+#include <xlnt/cell/cell.hpp>
+#include <xlnt/cell/cell_reference.hpp>
+#include <xlnt/cell/comment.hpp>
+#include <xlnt/common/datetime.hpp>
+#include <xlnt/common/encoding.hpp>
+#include <xlnt/common/exceptions.hpp>
+#include <xlnt/common/relationship.hpp>
+#include <xlnt/common/types.hpp>
+#include <xlnt/common/zip_file.hpp>
+#include <xlnt/styles/alignment.hpp>
+#include <xlnt/styles/border.hpp>
+#include <xlnt/styles/color.hpp>
+#include <xlnt/styles/fill.hpp>
+#include <xlnt/styles/font.hpp>
+#include <xlnt/styles/named_style.hpp>
+#include <xlnt/styles/number_format.hpp>
+#include <xlnt/styles/protection.hpp>
+#include <xlnt/styles/side.hpp>
+#include <xlnt/styles/style.hpp>
+#include <xlnt/workbook/document_properties.hpp>
+#include <xlnt/workbook/document_security.hpp>
+#include <xlnt/workbook/external_book.hpp>
+#include <xlnt/workbook/manifest.hpp>
+#include <xlnt/workbook/named_range.hpp>
+#include <xlnt/workbook/theme.hpp>
+#include <xlnt/workbook/workbook.hpp>
+#include <xlnt/worksheet/cell_vector.hpp>
+#include <xlnt/worksheet/column_properties.hpp>
+#include <xlnt/worksheet/major_order.hpp>
+#include <xlnt/worksheet/page_margins.hpp>
+#include <xlnt/worksheet/page_setup.hpp>
+#include <xlnt/worksheet/pane.hpp>
+#include <xlnt/worksheet/range.hpp>
+#include <xlnt/worksheet/range_reference.hpp>
+#include <xlnt/worksheet/row_properties.hpp>
+#include <xlnt/worksheet/selection.hpp>
+#include <xlnt/worksheet/sheet_protection.hpp>
+#include <xlnt/worksheet/sheet_view.hpp>
+#include <xlnt/worksheet/worksheet_properties.hpp>
+#include <xlnt/worksheet/worksheet.hpp>
diff --git a/source/worksheet/worksheet.cpp b/source/worksheet/worksheet.cpp
index a3d1cb11..8e5fcd34 100644
--- a/source/worksheet/worksheet.cpp
+++ b/source/worksheet/worksheet.cpp
@@ -1,16 +1,20 @@
 #include <algorithm>
+#include <limits>
 
 #include <xlnt/cell/cell.hpp>
+#include <xlnt/cell/cell_reference.hpp>
 #include <xlnt/common/datetime.hpp>
 #include <xlnt/common/exceptions.hpp>
 #include <xlnt/common/relationship.hpp>
+#include <xlnt/common/types.hpp>
 #include <xlnt/workbook/named_range.hpp>
 #include <xlnt/workbook/workbook.hpp>
 #include <xlnt/worksheet/range.hpp>
 #include <xlnt/worksheet/range_reference.hpp>
 #include <xlnt/worksheet/worksheet.hpp>
 
-#include "detail/worksheet_impl.hpp"
+#include <detail/cell_impl.hpp>
+#include <detail/worksheet_impl.hpp>
 
 namespace xlnt {