--- a/src/relpipe-out-nullbyte.cpp	Tue Dec 04 15:20:03 2018 +0100
+++ b/src/relpipe-out-nullbyte.cpp	Tue Dec 04 17:19:10 2018 +0100
@@ -26,13 +26,11 @@
 #include <relpipe/reader/RelationalReader.h>
 #include <relpipe/reader/RelpipeReaderException.h>
 
-#include <relpipe/writer/RelationalWriter.h>
-#include <relpipe/writer/RelpipeWriterException.h>
-#include <relpipe/writer/Factory.h>
-#include <relpipe/writer/TypeId.h>
+#include "NullByteHandler.h"
 
 using namespace relpipe::cli;
 using namespace relpipe::reader;
+using namespace relpipe::out::nullbyte;
 
 int main(int argc, char**argv) {
 	CLI cli(argc, argv);
@@ -41,8 +39,8 @@
 
 	try {
 		std::shared_ptr<RelationalReader> reader(Factory::create(std::cin));
-		//TabularPrefetchingHandler handler(std::cout);
-		//reader->addHandler(&handler);
+		NullByteHandler handler(std::cout);
+		reader->addHandler(&handler);
 		reader->process();
 
 		resultCode = CLI::EXIT_CODE_SUCCESS;