--- a/ArgumentsCommand.h	Sun Aug 12 12:56:18 2018 +0200
+++ b/ArgumentsCommand.h	Mon Aug 13 20:31:09 2018 +0200
@@ -6,7 +6,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <typedefs.h>
+#include <relpipe/writer/typedefs.h>
 
 #include "Command.h"
 

--- a/DemoCommand.h	Sun Aug 12 12:56:18 2018 +0200
+++ b/DemoCommand.h	Mon Aug 13 20:31:09 2018 +0200
@@ -6,7 +6,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <typedefs.h>
+#include <relpipe/writer/typedefs.h>
 
 #include "Command.h"
 

--- a/StdInCommand.h	Sun Aug 12 12:56:18 2018 +0200
+++ b/StdInCommand.h	Mon Aug 13 20:31:09 2018 +0200
@@ -6,10 +6,9 @@
 #include <vector>
 #include <algorithm>
 #include <string>
-
-#include <typedefs.h>
 #include <locale>
 
+#include <relpipe/writer/typedefs.h>
 #include <relpipe/cli/CLI.h>
 
 #include "Command.h"

--- a/relpipe-in-cli.cpp	Sun Aug 12 12:56:18 2018 +0200
+++ b/relpipe-in-cli.cpp	Mon Aug 13 20:31:09 2018 +0200
@@ -1,10 +1,10 @@
 #include <cstdlib>
 #include <memory>
 
-#include <RelationalWriter.h>
-#include <RelpipeWriterException.h>
-#include <Factory.h>
-#include <TypeId.h>
+#include <relpipe/writer/RelationalWriter.h>
+#include <relpipe/writer/RelpipeWriterException.h>
+#include <relpipe/writer/Factory.h>
+#include <relpipe/writer/TypeId.h>
 
 #include <relpipe/cli/CLI.h>