--- a/src/format.h	Sat Jul 21 23:01:47 2018 +0200
+++ b/src/format.h	Sat Jul 21 23:46:29 2018 +0200
@@ -3,12 +3,14 @@
 #include <cstdint>
 #include <string>
 
+#include "../include/TypeId.h"
+
 namespace relpipe {
 namespace writer {
 
-const integer_t DATA_TYPE_ID_BOOLEAN = 1;
-const integer_t DATA_TYPE_ID_INTEGER = 2;
-const integer_t DATA_TYPE_ID_STRING = 3;
+const integer_t DATA_TYPE_ID_BOOLEAN = static_cast<integer_t>(TypeId::BOOLEAN);
+const integer_t DATA_TYPE_ID_INTEGER = static_cast<integer_t>(TypeId::INTEGER);
+const integer_t DATA_TYPE_ID_STRING = static_cast<integer_t>(TypeId::STRING);
 
 const string_t DATA_TYPE_CODE_BOOLEAN = L"boolean";
 const string_t DATA_TYPE_CODE_INTEGER = L"integer";