Moved files from sqlpp11/vendor to sqlpp11

2026-01-05 12:40:40 -06:00 · 2014-06-13 18:51:51 +02:00
parent 07980a72a2
commit 060d59125c
61 changed files with 126 additions and 126 deletions
--- a/include/sqlpp11/alias.h
+++ b/include/sqlpp11/alias.h
@@ -28,7 +28,7 @@
 #define SQLPP_ALIAS_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/assignment.h
+++ b/include/sqlpp11/vendor/assignment.h
@@ -31,8 +31,8 @@
 #include <sqlpp11/null.h>
 #include <sqlpp11/tvin.h>
 #include <sqlpp11/serialize.h>
-#include <sqlpp11/vendor/serializer.h>
-#include <sqlpp11/vendor/simple_column.h>
+#include <sqlpp11/serializer.h>
+#include <sqlpp11/simple_column.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/basic_expression_operators.h
+++ b/include/sqlpp11/basic_expression_operators.h
@@ -29,10 +29,10 @@

 #include <sqlpp11/alias.h>
 #include <sqlpp11/sort_order.h>
-#include <sqlpp11/vendor/expression_fwd.h>
-#include <sqlpp11/vendor/in_fwd.h>
-#include <sqlpp11/vendor/is_null_fwd.h>
-#include <sqlpp11/vendor/wrap_operand.h>
+#include <sqlpp11/expression_fwd.h>
+#include <sqlpp11/in_fwd.h>
+#include <sqlpp11/is_null_fwd.h>
+#include <sqlpp11/wrap_operand.h>
 #include <sqlpp11/detail/logic.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/char_result_row.h
+++ b/include/sqlpp11/vendor/char_result_row.h
--- a/include/sqlpp11/column.h
+++ b/include/sqlpp11/column.h
@@ -33,10 +33,10 @@
 #include <sqlpp11/null.h>
 #include <sqlpp11/sort_order.h>
 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/assignment.h>
-#include <sqlpp11/vendor/expression.h>
-#include <sqlpp11/vendor/serializer.h>
-#include <sqlpp11/vendor/wrong.h>
+#include <sqlpp11/assignment.h>
+#include <sqlpp11/expression.h>
+#include <sqlpp11/serializer.h>
+#include <sqlpp11/wrong.h>
 #include <sqlpp11/detail/type_set.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/concat.h
+++ b/include/sqlpp11/vendor/concat.h
@@ -28,7 +28,7 @@
 #define SQLPP_CONCAT_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
+#include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/detail/logic.h>

 namespace sqlpp
--- a/include/sqlpp11/detail/type_set.h
+++ b/include/sqlpp11/detail/type_set.h
@@ -29,7 +29,7 @@

 #include <tuple>
 #include <type_traits>
-#include <sqlpp11/vendor/wrong.h>
+#include <sqlpp11/wrong.h>
 #include <sqlpp11/detail/logic.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/expression.h
+++ b/include/sqlpp11/vendor/expression.h
@@ -30,10 +30,10 @@
 #include <sqlpp11/alias.h>
 #include <sqlpp11/boolean.h>
 #include <sqlpp11/tvin.h>
-#include <sqlpp11/vendor/noop.h>
-#include <sqlpp11/vendor/expression_fwd.h>
-#include <sqlpp11/vendor/serializer.h>
-#include <sqlpp11/vendor/wrap_operand.h>
+#include <sqlpp11/noop.h>
+#include <sqlpp11/expression_fwd.h>
+#include <sqlpp11/serializer.h>
+#include <sqlpp11/wrap_operand.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/expression_fwd.h
+++ b/include/sqlpp11/vendor/expression_fwd.h
--- a/include/sqlpp11/vendor/extra_tables.h
+++ b/include/sqlpp11/vendor/extra_tables.h
@@ -29,7 +29,7 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/detail/logic.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/policy_update.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/field.h
+++ b/include/sqlpp11/vendor/field.h
--- a/include/sqlpp11/vendor/from.h
+++ b/include/sqlpp11/vendor/from.h
@@ -28,10 +28,10 @@
 #define SQLPP_FROM_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/interpretable_list.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
+#include <sqlpp11/interpretable_list.h>
+#include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/detail/logic.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/policy_update.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/functions.h
+++ b/include/sqlpp11/functions.h
@@ -30,9 +30,9 @@
 #include <sqlpp11/parameter.h>
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/column_types.h>
-#include <sqlpp11/vendor/in.h>
-#include <sqlpp11/vendor/is_null.h>
-#include <sqlpp11/vendor/value_type.h>
+#include <sqlpp11/in.h>
+#include <sqlpp11/is_null.h>
+#include <sqlpp11/value_type.h>
 #include <sqlpp11/exists.h>
 #include <sqlpp11/any.h>
 #include <sqlpp11/some.h>
--- a/include/sqlpp11/vendor/group_by.h
+++ b/include/sqlpp11/vendor/group_by.h
@@ -29,10 +29,10 @@

 #include <tuple>
 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/expression.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/interpretable_list.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/expression.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/interpretable_list.h>
+#include <sqlpp11/policy_update.h>
 #include <sqlpp11/detail/logic.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/having.h
+++ b/include/sqlpp11/vendor/having.h
@@ -28,10 +28,10 @@
 #define SQLPP_HAVING_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/expression.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/interpretable_list.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/expression.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/interpretable_list.h>
+#include <sqlpp11/policy_update.h>
 #include <sqlpp11/detail/logic.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/in.h
+++ b/include/sqlpp11/vendor/in.h
@@ -29,7 +29,7 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/boolean.h>
-#include <sqlpp11/vendor/in_fwd.h>
+#include <sqlpp11/in_fwd.h>
 #include <sqlpp11/detail/type_set.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/in_fwd.h
+++ b/include/sqlpp11/vendor/in_fwd.h
--- a/include/sqlpp11/insert.h
+++ b/include/sqlpp11/insert.h
@@ -32,9 +32,9 @@
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/prepared_insert.h>
 #include <sqlpp11/default_value.h>
-#include <sqlpp11/vendor/noop.h>
-#include <sqlpp11/vendor/into.h>
-#include <sqlpp11/vendor/insert_value_list.h>
+#include <sqlpp11/noop.h>
+#include <sqlpp11/into.h>
+#include <sqlpp11/insert_value_list.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/insert_value.h
+++ b/include/sqlpp11/vendor/insert_value.h
@@ -31,7 +31,7 @@
 #include <sqlpp11/null.h>
 #include <sqlpp11/tvin.h>
 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>
 #include <sqlpp11/detail/type_set.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/insert_value_list.h
+++ b/include/sqlpp11/vendor/insert_value_list.h
@@ -29,11 +29,11 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/detail/logic.h>
-#include <sqlpp11/vendor/assignment.h>
-#include <sqlpp11/vendor/interpretable_list.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/insert_value.h>
-#include <sqlpp11/vendor/simple_column.h>
+#include <sqlpp11/assignment.h>
+#include <sqlpp11/interpretable_list.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/insert_value.h>
+#include <sqlpp11/simple_column.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/integral.h
+++ b/include/sqlpp11/integral.h
@@ -32,7 +32,7 @@
 #include <sqlpp11/basic_expression_operators.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/exception.h>
-#include <sqlpp11/vendor/value_type.h>
+#include <sqlpp11/value_type.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/interpret.h
+++ b/include/sqlpp11/interpret.h
@@ -27,7 +27,7 @@
 #ifndef SQLPP_INTERPRET_H
 #define SQLPP_INTERPRET_H

-#include <sqlpp11/vendor/interpreter.h>
+#include <sqlpp11/interpreter.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/interpret_tuple.h
+++ b/include/sqlpp11/vendor/interpret_tuple.h
--- a/include/sqlpp11/vendor/interpretable.h
+++ b/include/sqlpp11/vendor/interpretable.h
--- a/include/sqlpp11/vendor/interpretable_list.h
+++ b/include/sqlpp11/vendor/interpretable_list.h
@@ -28,7 +28,7 @@
 #define SQLPP_INTERPRETABLE_LIST_H

 #include <vector>
-#include <sqlpp11/vendor/interpretable.h>
+#include <sqlpp11/interpretable.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/interpreter.h
+++ b/include/sqlpp11/vendor/interpreter.h
@@ -24,10 +24,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef SQLPP_VENDOR_INTERPRETER_H
-#define SQLPP_VENDOR_INTERPRETER_H
+#ifndef SQLPP_INTERPRETER_H
+#define SQLPP_INTERPRETER_H

-#include <sqlpp11/vendor/wrong.h>
+#include <sqlpp11/wrong.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/into.h
+++ b/include/sqlpp11/vendor/into.h
@@ -24,12 +24,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef SQLPP_VENDOR_INTO_H
-#define SQLPP_VENDOR_INTO_H
+#ifndef SQLPP_INTO_H
+#define SQLPP_INTO_H

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/no_value.h>
-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>
 #include <sqlpp11/detail/type_set.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/is_null.h
+++ b/include/sqlpp11/vendor/is_null.h
--- a/include/sqlpp11/vendor/is_null_fwd.h
+++ b/include/sqlpp11/vendor/is_null_fwd.h
--- a/include/sqlpp11/join.h
+++ b/include/sqlpp11/join.h
@@ -29,7 +29,7 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/on.h>
-#include <sqlpp11/vendor/noop.h>
+#include <sqlpp11/noop.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/like.h
+++ b/include/sqlpp11/vendor/like.h
--- a/include/sqlpp11/vendor/limit.h
+++ b/include/sqlpp11/vendor/limit.h
@@ -28,7 +28,7 @@
 #define SQLPP_LIMIT_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/policy_update.h>
 #include <sqlpp11/detail/type_set.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/named_interpretable.h
+++ b/include/sqlpp11/vendor/named_interpretable.h
--- a/include/sqlpp11/vendor/noop.h
+++ b/include/sqlpp11/vendor/noop.h
@@ -29,7 +29,7 @@

 #include <type_traits>
 #include <sqlpp11/no_value.h>
-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/noop_fwd.h
+++ b/include/sqlpp11/vendor/noop_fwd.h
--- a/include/sqlpp11/vendor/offset.h
+++ b/include/sqlpp11/vendor/offset.h
@@ -28,7 +28,7 @@
 #define SQLPP_OFFSET_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/policy_update.h>
 #include <sqlpp11/detail/type_set.h>

 namespace sqlpp
--- a/include/sqlpp11/on.h
+++ b/include/sqlpp11/on.h
@@ -28,8 +28,8 @@
 #define SQLPP_ON_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/interpretable_list.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/interpretable_list.h>
 #include <sqlpp11/detail/logic.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/order_by.h
+++ b/include/sqlpp11/vendor/order_by.h
@@ -29,9 +29,9 @@

 #include <tuple>
 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/interpretable.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/interpretable.h>
+#include <sqlpp11/policy_update.h>
 #include <sqlpp11/detail/logic.h>
 #include <sqlpp11/detail/type_set.h>

--- a/include/sqlpp11/parameter_list.h
+++ b/include/sqlpp11/parameter_list.h
@@ -29,7 +29,7 @@

 #include <tuple>
 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/wrong.h>
+#include <sqlpp11/wrong.h>
 #include <sqlpp11/detail/index_sequence.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/policy_update.h
+++ b/include/sqlpp11/vendor/policy_update.h
@@ -24,10 +24,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef SQLPP_VENDOR_POLICY_UPDATE_H
-#define SQLPP_VENDOR_POLICY_UPDATE_H
+#ifndef SQLPP_POLICY_UPDATE_H
+#define SQLPP_POLICY_UPDATE_H

-#include <sqlpp11/vendor/wrong.h>
+#include <sqlpp11/wrong.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/remove.h
+++ b/include/sqlpp11/remove.h
@@ -31,12 +31,12 @@
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/prepared_remove.h>
-#include <sqlpp11/vendor/noop.h>
+#include <sqlpp11/noop.h>
 #warning: need to use another table provider, since delete can be used with several tables
-#include <sqlpp11/vendor/from.h>
-#include <sqlpp11/vendor/extra_tables.h>
-#include <sqlpp11/vendor/using.h>
-#include <sqlpp11/vendor/where.h>
+#include <sqlpp11/from.h>
+#include <sqlpp11/extra_tables.h>
+#include <sqlpp11/using.h>
+#include <sqlpp11/where.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/result_row.h
+++ b/include/sqlpp11/result_row.h
@@ -28,8 +28,8 @@
 #define SQLPP_RESULT_ROW_H

 #include <map>
-#include <sqlpp11/vendor/char_result_row.h>
-#include <sqlpp11/vendor/field.h>
+#include <sqlpp11/char_result_row.h>
+#include <sqlpp11/field.h>
 #include <sqlpp11/text.h>
 #include <sqlpp11/detail/column_index_sequence.h>

--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -29,19 +29,19 @@

 #include <sqlpp11/statement.h>

-#include <sqlpp11/vendor/noop.h>
-#include <sqlpp11/vendor/select_flag_list.h>
-#include <sqlpp11/vendor/select_column_list.h>
-#include <sqlpp11/vendor/from.h>
-#include <sqlpp11/vendor/extra_tables.h>
-#include <sqlpp11/vendor/where.h>
-#include <sqlpp11/vendor/group_by.h>
-#include <sqlpp11/vendor/having.h>
-#include <sqlpp11/vendor/order_by.h>
-#include <sqlpp11/vendor/limit.h>
-#include <sqlpp11/vendor/offset.h>
-#include <sqlpp11/vendor/expression.h>
-#include <sqlpp11/vendor/wrong.h>
+#include <sqlpp11/noop.h>
+#include <sqlpp11/select_flag_list.h>
+#include <sqlpp11/select_column_list.h>
+#include <sqlpp11/from.h>
+#include <sqlpp11/extra_tables.h>
+#include <sqlpp11/where.h>
+#include <sqlpp11/group_by.h>
+#include <sqlpp11/having.h>
+#include <sqlpp11/order_by.h>
+#include <sqlpp11/limit.h>
+#include <sqlpp11/offset.h>
+#include <sqlpp11/expression.h>
+#include <sqlpp11/wrong.h>


 namespace sqlpp
--- a/include/sqlpp11/vendor/select_column_list.h
+++ b/include/sqlpp11/vendor/select_column_list.h
@@ -31,12 +31,12 @@
 #include <sqlpp11/result_row.h>
 #include <sqlpp11/table.h>
 #include <sqlpp11/no_value.h>
-#include <sqlpp11/vendor/field.h>
-#include <sqlpp11/vendor/expression_fwd.h>
-#include <sqlpp11/vendor/select_pseudo_table.h>
-#include <sqlpp11/vendor/named_interpretable.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/field.h>
+#include <sqlpp11/expression_fwd.h>
+#include <sqlpp11/select_pseudo_table.h>
+#include <sqlpp11/named_interpretable.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/policy_update.h>
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/detail/copy_tuple_args.h>

--- a/include/sqlpp11/vendor/select_flag_list.h
+++ b/include/sqlpp11/vendor/select_flag_list.h
@@ -24,15 +24,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef SQLPP_VENDOR_SELECT_FLAG_LIST_H
-#define SQLPP_VENDOR_SELECT_FLAG_LIST_H
+#ifndef SQLPP_SELECT_FLAG_LIST_H
+#define SQLPP_SELECT_FLAG_LIST_H

 #include <tuple>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/select_flags.h>
 #include <sqlpp11/detail/type_set.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/policy_update.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/select_flags.h
+++ b/include/sqlpp11/select_flags.h
@@ -29,7 +29,7 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/detail/type_set.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
+#include <sqlpp11/interpret_tuple.h>
 #include <tuple>

 namespace sqlpp
--- a/include/sqlpp11/vendor/select_pseudo_table.h
+++ b/include/sqlpp11/vendor/select_pseudo_table.h
--- a/include/sqlpp11/serialize.h
+++ b/include/sqlpp11/serialize.h
@@ -27,7 +27,7 @@
 #ifndef SQLPP_SERIALIZE_H
 #define SQLPP_SERIALIZE_H

-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/serializer.h
+++ b/include/sqlpp11/vendor/serializer.h
@@ -24,10 +24,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef SQLPP_VENDOR_SERIALIZER_H
-#define SQLPP_VENDOR_SERIALIZER_H
+#ifndef SQLPP_SERIALIZER_H
+#define SQLPP_SERIALIZER_H

-#include <sqlpp11/vendor/wrong.h>
+#include <sqlpp11/wrong.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/simple_column.h
+++ b/include/sqlpp11/vendor/simple_column.h
@@ -27,7 +27,7 @@
 #ifndef SQLPP_SIMPLE_COLUMN_H
 #define SQLPP_SIMPLE_COLUMN_H

-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/single_table.h
+++ b/include/sqlpp11/vendor/single_table.h
@@ -24,12 +24,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef SQLPP_VENDOR_SINGLE_TABLE_H
-#define SQLPP_VENDOR_SINGLE_TABLE_H
+#ifndef SQLPP_SINGLE_TABLE_H
+#define SQLPP_SINGLE_TABLE_H

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/no_value.h>
-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>
 #include <sqlpp11/detail/type_set.h>

 namespace sqlpp
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -31,9 +31,9 @@
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/prepared_select.h>
 #include <sqlpp11/serialize.h>
-#include <sqlpp11/vendor/noop.h>
-#include <sqlpp11/vendor/policy_update.h>
-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/noop.h>
+#include <sqlpp11/policy_update.h>
+#include <sqlpp11/serializer.h>

 #include <sqlpp11/detail/get_last.h>
 #include <sqlpp11/detail/pick_arg.h>
--- a/include/sqlpp11/text.h
+++ b/include/sqlpp11/text.h
@@ -31,8 +31,8 @@
 #include <sqlpp11/basic_expression_operators.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/exception.h>
-#include <sqlpp11/vendor/concat.h>
-#include <sqlpp11/vendor/like.h>
+#include <sqlpp11/concat.h>
+#include <sqlpp11/like.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/tvin.h
+++ b/include/sqlpp11/tvin.h
@@ -31,8 +31,8 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/serialize.h>
-#include <sqlpp11/vendor/serializer.h>
-#include <sqlpp11/vendor/wrap_operand.h>
+#include <sqlpp11/serializer.h>
+#include <sqlpp11/wrap_operand.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/update.h
+++ b/include/sqlpp11/update.h
@@ -32,10 +32,10 @@
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/prepared_update.h>
-#include <sqlpp11/vendor/single_table.h>
-#include <sqlpp11/vendor/update_list.h>
-#include <sqlpp11/vendor/noop.h>
-#include <sqlpp11/vendor/where.h>
+#include <sqlpp11/single_table.h>
+#include <sqlpp11/update_list.h>
+#include <sqlpp11/noop.h>
+#include <sqlpp11/where.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/update_list.h
+++ b/include/sqlpp11/vendor/update_list.h
@@ -29,8 +29,8 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/detail/type_set.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/interpretable_list.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/interpretable_list.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/using.h
+++ b/include/sqlpp11/vendor/using.h
@@ -28,10 +28,10 @@
 #define SQLPP_USING_H

 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/vendor/interpretable_list.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
+#include <sqlpp11/interpretable_list.h>
+#include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/detail/type_set.h>
-#include <sqlpp11/vendor/policy_update.h>
+#include <sqlpp11/policy_update.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/value_type.h
+++ b/include/sqlpp11/vendor/value_type.h
@@ -28,7 +28,7 @@
 #define SQLPP_VALUE_TYPE_H

 #include <type_traits>
-#include <sqlpp11/vendor/wrap_operand.h>
+#include <sqlpp11/wrap_operand.h>

 namespace sqlpp
 {
--- a/include/sqlpp11/vendor/where.h
+++ b/include/sqlpp11/vendor/where.h
@@ -29,9 +29,9 @@

 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/vendor/expression.h>
-#include <sqlpp11/vendor/interpret_tuple.h>
-#include <sqlpp11/vendor/interpretable_list.h>
+#include <sqlpp11/expression.h>
+#include <sqlpp11/interpret_tuple.h>
+#include <sqlpp11/interpretable_list.h>
 #include <sqlpp11/detail/logic.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/wrap_operand.h
+++ b/include/sqlpp11/vendor/wrap_operand.h
@@ -28,7 +28,7 @@
 #define SQLPP_DETAIL_WRAP_OPERAND_H

 #include <string>
-#include <sqlpp11/vendor/serializer.h>
+#include <sqlpp11/serializer.h>
 #include <sqlpp11/type_traits.h>

 namespace sqlpp
--- a/include/sqlpp11/vendor/wrong.h
+++ b/include/sqlpp11/vendor/wrong.h
@@ -24,8 +24,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef SQLPP_VENDOR_WRONG_H
-#define SQLPP_VENDOR_WRONG_H
+#ifndef SQLPP_WRONG_H
+#define SQLPP_WRONG_H

 #include <type_traits>