--- a/src/X11Handler.h	Sun Mar 28 18:41:21 2021 +0200
+++ b/src/X11Handler.h	Sun Mar 28 18:57:10 2021 +0200
@@ -25,7 +25,7 @@
 #include <codecvt>
 #include <stdexcept>
 
-#include <relpipe/reader/typedefs.h>
+#include <relpipe/common/type/typedefs.h>
 #include <relpipe/reader/TypeId.h>
 #include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
 #include <relpipe/reader/handlers/AttributeMetadata.h>
@@ -36,24 +36,20 @@
 namespace out {
 namespace x11 {
 
-using namespace relpipe;
-using namespace relpipe::reader;
-using namespace relpipe::reader::handlers;
-
-class X11Handler : public RelationalReaderStringHandler {
+class X11Handler : public relpipe::reader::handlers::RelationalReaderStringHandler {
 private:
 	std::ostream& output;
 	Configuration& configuration;
 	const char QUOTE = '"';
 	std::wstring_convert<std::codecvt_utf8<wchar_t>> convertor; // TODO: probably not needed
-	std::vector<AttributeMetadata> firstAttributes;
-	integer_t valueCount = 0;
+	std::vector<relpipe::reader::handlers::AttributeMetadata> firstAttributes;
+	relpipe::common::type::Integer valueCount = 0;
 public:
 
 	X11Handler(std::ostream& output, Configuration& configuration) : output(output), configuration(configuration) {
 	}
 
-	void startRelation(string_t name, std::vector<AttributeMetadata> attributes) override {
+	void startRelation(relpipe::common::type::StringX name, std::vector<relpipe::reader::handlers::AttributeMetadata> attributes) override {
 		if (firstAttributes.empty()) {
 			firstAttributes = attributes;
 			if (configuration.writeHeader) for (auto attr : attributes) attribute(attr.getAttributeName());
@@ -62,7 +58,7 @@
 		}
 	}
 
-	void attribute(const string_t& value) override {
+	void attribute(const relpipe::common::type::StringX& value) override {
 		valueCount++;
 
 		if (value.size() > 0) {