Clean up includes and forward declarations

5 files changed, 33 insertions, 30 deletions

diff --git a/tests/TestClient.hpp b/tests/TestClient.hpp
index b234d7c2..e76e4aa5 100644
--- a/tests/TestClient.hpp
+++ b/tests/TestClient.hpp
@@ -17,11 +17,11 @@
 #ifndef INGEN_TESTCLIENT_HPP
 #define INGEN_TESTCLIENT_HPP
 
-#include <boost/variant/get.hpp>
-
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
 
+#include <boost/variant/get.hpp>
+
 using namespace ingen;
 
 class TestClient : public ingen::Interface
diff --git a/tests/ingen_bench.cpp b/tests/ingen_bench.cpp
index 1a0d84ca..99abee97 100644
--- a/tests/ingen_bench.cpp
+++ b/tests/ingen_bench.cpp
@@ -14,23 +14,23 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cstdlib>
-#include <iostream>
-#include <string>
-#include <thread>
-
+#include "ingen/Atom.hpp"
 #include "ingen/Clock.hpp"
 #include "ingen/Configuration.hpp"
 #include "ingen/EngineBase.hpp"
 #include "ingen/Forge.hpp"
-#include "ingen/Interface.hpp"
 #include "ingen/Parser.hpp"
 #include "ingen/World.hpp"
 #include "ingen/runtime_paths.hpp"
 #include "ingen/types.hpp"
 
-#include "TestClient.hpp"
-#include "ingen_config.h"
+#include <chrono>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+#include <memory>
+#include <string>
 
 using namespace std;
 using namespace ingen;
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index cd86985f..fc114fb1 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -14,39 +14,39 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <signal.h>
-
-#include <cstdlib>
-#include <iostream>
-#include <string>
-
-#include <boost/optional.hpp>
-
-#include "raul/Path.hpp"
-
-#include "serd/serd.h"
-#include "sord/sordmm.hpp"
-#include "sratom/sratom.h"
-
+#include "TestClient.hpp"
 #include "ingen_config.h"
 
+#include "ingen/Atom.hpp"
+#include "ingen/AtomForgeSink.hpp"
 #include "ingen/AtomReader.hpp"
 #include "ingen/AtomWriter.hpp"
 #include "ingen/Configuration.hpp"
-#include "ingen/Configuration.hpp"
 #include "ingen/EngineBase.hpp"
+#include "ingen/FilePath.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Parser.hpp"
 #include "ingen/Properties.hpp"
 #include "ingen/Serialiser.hpp"
 #include "ingen/Store.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/URIMap.hpp"
 #include "ingen/World.hpp"
 #include "ingen/filesystem.hpp"
+#include "ingen/fmt.hpp"
 #include "ingen/runtime_paths.hpp"
 #include "ingen/types.hpp"
+#include "raul/Path.hpp"
+#include "serd/serd.h"
+#include "sord/sordmm.hpp"
+#include "sratom/sratom.h"
 
-#include "TestClient.hpp"
+#include <chrono>
+#include <cstdint>
+#include <cstdlib>
+#include <iostream>
+#include <string>
+#include <utility>
 
 using namespace std;
 using namespace ingen;
diff --git a/tests/test_utils.hpp b/tests/test_utils.hpp
index c8271325..48e3a588 100644
--- a/tests/test_utils.hpp
+++ b/tests/test_utils.hpp
@@ -18,8 +18,6 @@
 
 #include <iostream>
 
-using ingen::fmt;
-
 #define EXPECT_TRUE(value) \
 	if (!(value)) { \
 		std::cerr << fmt("error: %1%:%2%: !%3%\n", \
diff --git a/tests/tst_FilePath.cpp b/tests/tst_FilePath.cpp
index ec0fe593..768371fe 100644
--- a/tests/tst_FilePath.cpp
+++ b/tests/tst_FilePath.cpp
@@ -14,12 +14,17 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <boost/utility/string_view.hpp>
+#include "test_utils.hpp"
 
 #include "ingen/FilePath.hpp"
-#include "test_utils.hpp"
+#include "ingen/fmt.hpp"
+
+#include <boost/utility/string_view.hpp>
+
+#include <string>
 
 using ingen::FilePath;
+using ingen::fmt;
 
 int
 main(int, char**)