From 29813ada1005d3344320da48006ea5419181f7e0 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 5 Aug 2018 12:32:40 +0200
Subject: Clean up includes

---
 chilbert/Algorithm.hpp    | 10 ++++++----
 chilbert/BigBitVec.hpp    |  1 +
 chilbert/FixBitVec.hpp    |  2 +-
 chilbert/GrayCodeRank.hpp |  2 ++
 chilbert/Hilbert.hpp      |  4 ++--
 test/test_fsb.cpp         |  1 -
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/chilbert/Algorithm.hpp b/chilbert/Algorithm.hpp
index f25359a..0200456 100644
--- a/chilbert/Algorithm.hpp
+++ b/chilbert/Algorithm.hpp
@@ -20,13 +20,15 @@
 #define CHILBERT_ALGORITHM_HPP
 
 
+#include "chilbert/FixBitVec.hpp"
 #include "chilbert/BigBitVec.hpp"
-#include "chilbert/GetLocation.hpp"
-#include "chilbert/SetLocation.hpp"
 #include "chilbert/GetBits.hpp"
-#include "chilbert/SetBits.hpp"
+#include "chilbert/GetLocation.hpp"
 #include "chilbert/GrayCodeRank.hpp"
-#include <string.h>
+#include "chilbert/SetBits.hpp"
+#include "chilbert/SetLocation.hpp"
+
+#include <cassert>
 
 
 // Templated Hilbert functions.
diff --git a/chilbert/BigBitVec.hpp b/chilbert/BigBitVec.hpp
index 7f812b6..df50d6e 100644
--- a/chilbert/BigBitVec.hpp
+++ b/chilbert/BigBitVec.hpp
@@ -22,6 +22,7 @@
 
 #include "chilbert/FixBitVec.hpp"
 
+#include <cassert>
 #include <cstring>
 
 #define BBV_MIN(a,b)		((a)<(b)?(a):(b))
diff --git a/chilbert/FixBitVec.hpp b/chilbert/FixBitVec.hpp
index 0a89803..3cdd6ff 100644
--- a/chilbert/FixBitVec.hpp
+++ b/chilbert/FixBitVec.hpp
@@ -21,8 +21,8 @@
 
 #include "chilbert/Operations.hpp"
 
-#include <inttypes.h>
 #include <cassert>
+#include <cstdint>
 
 namespace chilbert {
 
diff --git a/chilbert/GrayCodeRank.hpp b/chilbert/GrayCodeRank.hpp
index 494caf6..8e98592 100644
--- a/chilbert/GrayCodeRank.hpp
+++ b/chilbert/GrayCodeRank.hpp
@@ -20,8 +20,10 @@
 #define CHILBERT_GRAYCODERANK_HPP
 
 
+#include "chilbert/FixBitVec.hpp"
 #include "chilbert/BigBitVec.hpp"
 
+#include <cassert>
 
 namespace chilbert
 {
diff --git a/chilbert/Hilbert.hpp b/chilbert/Hilbert.hpp
index a4837dd..c3ecac7 100644
--- a/chilbert/Hilbert.hpp
+++ b/chilbert/Hilbert.hpp
@@ -20,9 +20,9 @@
 #define CHILBERT_HILBERT_HPP
 
 
-#include "chilbert/FixBitVec.hpp"
-#include "chilbert/BigBitVec.hpp"
 #include "chilbert/Algorithm.hpp"
+#include "chilbert/BigBitVec.hpp"
+#include "chilbert/FixBitVec.hpp"
 
 // Description of parameters:
 //
diff --git a/test/test_fsb.cpp b/test/test_fsb.cpp
index 587e91d..473438f 100644
--- a/test/test_fsb.cpp
+++ b/test/test_fsb.cpp
@@ -21,7 +21,6 @@
 #include "chilbert/FixBitVec.hpp"
 
 #include <cassert>
-#include <string>
 
 using namespace chilbert;
 
-- 
cgit v1.2.1