Fix header order.

65 files changed, 165 insertions, 157 deletions

diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h
index ac37231..04238ff 100644
--- a/include/tgbot/Api.h
+++ b/include/tgbot/Api.h
@@ -1,13 +1,6 @@
 #ifndef TGBOT_CPP_API_H
 #define TGBOT_CPP_API_H
 
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include <boost/property_tree/ptree.hpp>
-#include <boost/variant.hpp>
-
 #include "tgbot/TgTypeParser.h"
 #include "tgbot/net/HttpClient.h"
 #include "tgbot/net/HttpReqArg.h"
@@ -28,6 +21,13 @@
 #include "tgbot/types/LabeledPrice.h"
 #include "tgbot/types/ShippingOption.h"
 
+#include <boost/property_tree/ptree.hpp>
+#include <boost/variant.hpp>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
 namespace TgBot {
 
 class Bot;
diff --git a/include/tgbot/EventBroadcaster.h b/include/tgbot/EventBroadcaster.h
index 978a6fe..8d0d319 100644
--- a/include/tgbot/EventBroadcaster.h
+++ b/include/tgbot/EventBroadcaster.h
@@ -1,17 +1,17 @@
 #ifndef TGBOT_EVENTBROADCASTER_H
 #define TGBOT_EVENTBROADCASTER_H
 
-#include <string>
-#include <functional>
-#include <vector>
-#include <unordered_map>
-
 #include "tgbot/export.h"
 #include "tgbot/types/Message.h"
 #include "tgbot/types/InlineQuery.h"
 #include "tgbot/types/ChosenInlineResult.h"
 #include "tgbot/types/CallbackQuery.h"
 
+#include <string>
+#include <functional>
+#include <vector>
+#include <unordered_map>
+
 namespace TgBot {
 
 class EventHandler;
diff --git a/include/tgbot/TgTypeParser.h b/include/tgbot/TgTypeParser.h
index 02f8ee5..63ed1ca 100644
--- a/include/tgbot/TgTypeParser.h
+++ b/include/tgbot/TgTypeParser.h
@@ -1,11 +1,6 @@
 #ifndef TGBOT_CPP_TGTYPEPARSER_H
 #define TGBOT_CPP_TGTYPEPARSER_H
 
-#include <string>
-
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
-
 #include "tgbot/export.h"
 #include "tgbot/types/User.h"
 #include "tgbot/types/Chat.h"
@@ -86,6 +81,11 @@
 #include "tgbot/types/InputMediaDocument.h"
 #include "tgbot/types/InputMediaAnimation.h"
 
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/json_parser.hpp>
+
+#include <string>
+
 namespace TgBot {
 
 class TGBOT_API TgTypeParser {
diff --git a/include/tgbot/net/BoostHttpOnlySslClient.h b/include/tgbot/net/BoostHttpOnlySslClient.h
index 594b3fe..a047fea 100644
--- a/include/tgbot/net/BoostHttpOnlySslClient.h
+++ b/include/tgbot/net/BoostHttpOnlySslClient.h
@@ -1,15 +1,15 @@
 #ifndef TGBOT_BOOSTHTTPCLIENT_H
 #define TGBOT_BOOSTHTTPCLIENT_H
 
-#include <string>
-
-#include <boost/asio.hpp>
-
 #include "tgbot/net/HttpClient.h"
 #include "tgbot/net/Url.h"
 #include "tgbot/net/HttpReqArg.h"
 #include "tgbot/net/HttpParser.h"
 
+#include <boost/asio.hpp>
+
+#include <string>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/net/CurlHttpClient.h b/include/tgbot/net/CurlHttpClient.h
index 202cc40..30e72ba 100644
--- a/include/tgbot/net/CurlHttpClient.h
+++ b/include/tgbot/net/CurlHttpClient.h
@@ -3,15 +3,15 @@
 
 #ifdef HAVE_CURL
 
-#include <string>
-
-#include <curl/curl.h>
-
 #include "tgbot/net/HttpClient.h"
 #include "tgbot/net/Url.h"
 #include "tgbot/net/HttpReqArg.h"
 #include "tgbot/net/HttpParser.h"
 
+#include <curl/curl.h>
+
+#include <string>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/net/HttpClient.h b/include/tgbot/net/HttpClient.h
index d9c72be..9b452d8 100644
--- a/include/tgbot/net/HttpClient.h
+++ b/include/tgbot/net/HttpClient.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_HTTPCLIENT_H
 #define TGBOT_HTTPCLIENT_H
 
-#include <string>
-
 #include "tgbot/net/Url.h"
 #include "tgbot/net/HttpReqArg.h"
 
+#include <string>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/net/HttpParser.h b/include/tgbot/net/HttpParser.h
index fabeacf..870ac38 100644
--- a/include/tgbot/net/HttpParser.h
+++ b/include/tgbot/net/HttpParser.h
@@ -1,13 +1,13 @@
 #ifndef TGBOT_HTTPPARSER_H
 #define TGBOT_HTTPPARSER_H
 
+#include "tgbot/net/Url.h"
+#include "tgbot/net/HttpReqArg.h"
+
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "tgbot/net/Url.h"
-#include "tgbot/net/HttpReqArg.h"
-
 namespace TgBot {
 
 class TGBOT_API HttpParser {
diff --git a/include/tgbot/net/HttpReqArg.h b/include/tgbot/net/HttpReqArg.h
index 72dfd7d..7c23eab 100644
--- a/include/tgbot/net/HttpReqArg.h
+++ b/include/tgbot/net/HttpReqArg.h
@@ -3,13 +3,13 @@
 
 #include "tgbot/export.h"
 
+#include <boost/lexical_cast.hpp>
+
 #include <string>
 #include <utility>
 #include <vector>
 #include <functional>
 
-#include <boost/lexical_cast.hpp>
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/net/HttpServer.h b/include/tgbot/net/HttpServer.h
index ccee077..51210d7 100644
--- a/include/tgbot/net/HttpServer.h
+++ b/include/tgbot/net/HttpServer.h
@@ -1,15 +1,15 @@
 #ifndef TGBOT_HTTPSERVER_H
 #define TGBOT_HTTPSERVER_H
 
+#include "tgbot/net/HttpParser.h"
+
+#include <boost/asio.hpp>
+
 #include <cstddef>
 #include <iostream>
 #include <string>
 #include <utility>
 
-#include <boost/asio.hpp>
-
-#include "tgbot/net/HttpParser.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/net/TgWebhookServer.h b/include/tgbot/net/TgWebhookServer.h
index 2f3c5b8..85b2934 100644
--- a/include/tgbot/net/TgWebhookServer.h
+++ b/include/tgbot/net/TgWebhookServer.h
@@ -1,13 +1,13 @@
 #ifndef TGBOT_TGHTTPSERVER_H
 #define TGBOT_TGHTTPSERVER_H
 
-#include <utility>
-
 #include "tgbot/Bot.h"
 #include "tgbot/EventHandler.h"
 #include "tgbot/TgTypeParser.h"
 #include "tgbot/net/HttpServer.h"
 
+#include <utility>
+
 namespace TgBot {
 
 template<typename Protocol>
diff --git a/include/tgbot/types/Animation.h b/include/tgbot/types/Animation.h
index 134dc84..ac54b2c 100644
--- a/include/tgbot/types/Animation.h
+++ b/include/tgbot/types/Animation.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_ANIMATION_H
 #define TGBOT_ANIMATION_H
 
+#include "tgbot/types/PhotoSize.h"
+
 #include <cstdint>
 #include <memory>
 #include <string>
 
-#include "tgbot/types/PhotoSize.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/Audio.h b/include/tgbot/types/Audio.h
index 05553d6..dae8729 100644
--- a/include/tgbot/types/Audio.h
+++ b/include/tgbot/types/Audio.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CPP_AUDIO_H
 #define TGBOT_CPP_AUDIO_H
 
+#include "tgbot/types/PhotoSize.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/PhotoSize.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/CallbackQuery.h b/include/tgbot/types/CallbackQuery.h
index 26454bc..b1367aa 100644
--- a/include/tgbot/types/CallbackQuery.h
+++ b/include/tgbot/types/CallbackQuery.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CALLBACKQUERY_H
 #define TGBOT_CALLBACKQUERY_H
 
-#include <memory>
-#include <string>
-
 #include "tgbot/types/User.h"
 #include "tgbot/types/Message.h"
 
+#include <memory>
+#include <string>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/Chat.h b/include/tgbot/types/Chat.h
index b0ed304..5731abd 100644
--- a/include/tgbot/types/Chat.h
+++ b/include/tgbot/types/Chat.h
@@ -1,13 +1,13 @@
 #ifndef TGBOT_CPP_CHAT_H
 #define TGBOT_CPP_CHAT_H
 
+#include "tgbot/types/ChatPhoto.h"
+#include "tgbot/types/ChatPermissions.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/ChatPhoto.h"
-#include "tgbot/types/ChatPermissions.h"
-
 namespace TgBot {
 
 class Message;
diff --git a/include/tgbot/types/ChatMember.h b/include/tgbot/types/ChatMember.h
index bfe12aa..47e79a4 100644
--- a/include/tgbot/types/ChatMember.h
+++ b/include/tgbot/types/ChatMember.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CHATMEMBER_H
 #define TGBOT_CHATMEMBER_H
 
+#include "tgbot/types/User.h"
+
 #include <cstdint>
 #include <memory>
 #include <string>
 
-#include "tgbot/types/User.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/ChatPermissions.h b/include/tgbot/types/ChatPermissions.h
index cfb4559..e6500db 100644
--- a/include/tgbot/types/ChatPermissions.h
+++ b/include/tgbot/types/ChatPermissions.h
@@ -4,7 +4,6 @@
 #include <memory>
 #include <string>
 
-
 namespace TgBot {
 
     /**
diff --git a/include/tgbot/types/ChosenInlineResult.h b/include/tgbot/types/ChosenInlineResult.h
index d1ecf93..d9af6ce 100644
--- a/include/tgbot/types/ChosenInlineResult.h
+++ b/include/tgbot/types/ChosenInlineResult.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CHOSENINLINERESULT_H
 #define TGBOT_CHOSENINLINERESULT_H
 
-#include <string>
-#include <memory>
-
 #include "tgbot/types/User.h"
 #include "tgbot/types/Location.h"
 
+#include <string>
+#include <memory>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/Document.h b/include/tgbot/types/Document.h
index b1dd78d..b82895f 100644
--- a/include/tgbot/types/Document.h
+++ b/include/tgbot/types/Document.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CPP_DOCUMENT_H
 #define TGBOT_CPP_DOCUMENT_H
 
+#include "tgbot/types/PhotoSize.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/PhotoSize.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/ForceReply.h b/include/tgbot/types/ForceReply.h
index f903e33..bf4fe0a 100644
--- a/include/tgbot/types/ForceReply.h
+++ b/include/tgbot/types/ForceReply.h
@@ -1,10 +1,10 @@
 #ifndef TGBOT_CPP_FORCEREPLY_H
 #define TGBOT_CPP_FORCEREPLY_H
 
-#include <memory>
-
 #include "tgbot/types/GenericReply.h"
 
+#include <memory>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/Game.h b/include/tgbot/types/Game.h
index a613b7d..90135f3 100644
--- a/include/tgbot/types/Game.h
+++ b/include/tgbot/types/Game.h
@@ -1,14 +1,14 @@
 #ifndef TGBOT_GAME_H
 #define TGBOT_GAME_H
 
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "tgbot/types/MessageEntity.h"
 #include "tgbot/types/Animation.h"
 #include "tgbot/types/PhotoSize.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/GameHighScore.h b/include/tgbot/types/GameHighScore.h
index 24d1d88..0c1caf6 100644
--- a/include/tgbot/types/GameHighScore.h
+++ b/include/tgbot/types/GameHighScore.h
@@ -1,13 +1,13 @@
 #ifndef TGBOT_GAMEHIGHSCORE_H
 #define TGBOT_GAMEHIGHSCORE_H
 
+#include "tgbot/types/PhotoSize.h"
+#include "tgbot/types/User.h"
+
 #include <cstdint>
 #include <memory>
 #include <string>
 
-#include "tgbot/types/PhotoSize.h"
-#include "tgbot/types/User.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineKeyboardButton.h b/include/tgbot/types/InlineKeyboardButton.h
index a987993..9ec5120 100644
--- a/include/tgbot/types/InlineKeyboardButton.h
+++ b/include/tgbot/types/InlineKeyboardButton.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEKEYBOARDBUTTON_H
 #define TGBOT_INLINEKEYBOARDBUTTON_H
 
-#include <string>
-#include <memory>
-
 #include "tgbot/types/CallbackGame.h"
 #include "tgbot/types/LoginUrl.h"
 
+#include <string>
+#include <memory>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineKeyboardMarkup.h b/include/tgbot/types/InlineKeyboardMarkup.h
index 7ace724..6496aee 100644
--- a/include/tgbot/types/InlineKeyboardMarkup.h
+++ b/include/tgbot/types/InlineKeyboardMarkup.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEKEYBOARDMARKUP_H
 #define TGBOT_INLINEKEYBOARDMARKUP_H
 
-#include <vector>
-#include <memory>
-
 #include "tgbot/types/GenericReply.h"
 #include "tgbot/types/InlineKeyboardButton.h"
 
+#include <vector>
+#include <memory>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQuery.h b/include/tgbot/types/InlineQuery.h
index 1a5ea76..e50f6d6 100644
--- a/include/tgbot/types/InlineQuery.h
+++ b/include/tgbot/types/InlineQuery.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERY_H
 #define TGBOT_INLINEQUERY_H
 
-#include <memory>
-#include <string>
-
 #include "tgbot/types/User.h"
 #include "tgbot/types/Location.h"
 
+#include <memory>
+#include <string>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResult.h b/include/tgbot/types/InlineQueryResult.h
index c5ab06b..ee385f9 100644
--- a/include/tgbot/types/InlineQueryResult.h
+++ b/include/tgbot/types/InlineQueryResult.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULT_H
 #define TGBOT_INLINEQUERYRESULT_H
 
-#include <memory>
-#include <string>
-
 #include "tgbot/types/InlineKeyboardMarkup.h"
 #include "tgbot/types/InputMessageContent.h"
 
+#include <memory>
+#include <string>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultArticle.h b/include/tgbot/types/InlineQueryResultArticle.h
index efa0e9d..5c51f3d 100644
--- a/include/tgbot/types/InlineQueryResultArticle.h
+++ b/include/tgbot/types/InlineQueryResultArticle.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTARTICLE_H
 #define TGBOT_INLINEQUERYRESULTARTICLE_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultAudio.h b/include/tgbot/types/InlineQueryResultAudio.h
index 041f16f..dfee389 100644
--- a/include/tgbot/types/InlineQueryResultAudio.h
+++ b/include/tgbot/types/InlineQueryResultAudio.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTAUDIO_H
 #define TGBOT_INLINEQUERYRESULTAUDIO_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedAudio.h b/include/tgbot/types/InlineQueryResultCachedAudio.h
index 50d489d..c157226 100644
--- a/include/tgbot/types/InlineQueryResultCachedAudio.h
+++ b/include/tgbot/types/InlineQueryResultCachedAudio.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDAUDIO_H
 #define TGBOT_INLINEQUERYRESULTCACHEDAUDIO_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedDocument.h b/include/tgbot/types/InlineQueryResultCachedDocument.h
index dfdb9a6..24bb2f3 100644
--- a/include/tgbot/types/InlineQueryResultCachedDocument.h
+++ b/include/tgbot/types/InlineQueryResultCachedDocument.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDDOCUMENT_H
 #define TGBOT_INLINEQUERYRESULTCACHEDDOCUMENT_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedGif.h b/include/tgbot/types/InlineQueryResultCachedGif.h
index ddc433b..23ec84a 100644
--- a/include/tgbot/types/InlineQueryResultCachedGif.h
+++ b/include/tgbot/types/InlineQueryResultCachedGif.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDGIF_H
 #define TGBOT_INLINEQUERYRESULTCACHEDGIF_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h b/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h
index 195fb80..19a63a8 100644
--- a/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h
+++ b/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDMPEG4GIF_H
 #define TGBOT_INLINEQUERYRESULTCACHEDMPEG4GIF_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedPhoto.h b/include/tgbot/types/InlineQueryResultCachedPhoto.h
index 7f2c6e1..ba32314 100644
--- a/include/tgbot/types/InlineQueryResultCachedPhoto.h
+++ b/include/tgbot/types/InlineQueryResultCachedPhoto.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDPHOTO_H
 #define TGBOT_INLINEQUERYRESULTCACHEDPHOTO_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedSticker.h b/include/tgbot/types/InlineQueryResultCachedSticker.h
index d9865cc..29290fc 100644
--- a/include/tgbot/types/InlineQueryResultCachedSticker.h
+++ b/include/tgbot/types/InlineQueryResultCachedSticker.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDSTICKER_H
 #define TGBOT_INLINEQUERYRESULTCACHEDSTICKER_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedVideo.h b/include/tgbot/types/InlineQueryResultCachedVideo.h
index a80a2c7..f7b700a 100644
--- a/include/tgbot/types/InlineQueryResultCachedVideo.h
+++ b/include/tgbot/types/InlineQueryResultCachedVideo.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDVIDEO_H
 #define TGBOT_INLINEQUERYRESULTCACHEDVIDEO_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultCachedVoice.h b/include/tgbot/types/InlineQueryResultCachedVoice.h
index 8a9bca8..ef08fca 100644
--- a/include/tgbot/types/InlineQueryResultCachedVoice.h
+++ b/include/tgbot/types/InlineQueryResultCachedVoice.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTCACHEDVOICE_H
 #define TGBOT_INLINEQUERYRESULTCACHEDVOICE_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultContact.h b/include/tgbot/types/InlineQueryResultContact.h
index dc0589e..83ae223 100644
--- a/include/tgbot/types/InlineQueryResultContact.h
+++ b/include/tgbot/types/InlineQueryResultContact.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTCONTACT_H
 #define TGBOT_INLINEQUERYRESULTCONTACT_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultDocument.h b/include/tgbot/types/InlineQueryResultDocument.h
index 9eb6f25..88a8ae1 100644
--- a/include/tgbot/types/InlineQueryResultDocument.h
+++ b/include/tgbot/types/InlineQueryResultDocument.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTDOCUMENT_H
 #define TGBOT_INLINEQUERYRESULTDOCUMENT_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultGame.h b/include/tgbot/types/InlineQueryResultGame.h
index 76e544c..7cee282 100644
--- a/include/tgbot/types/InlineQueryResultGame.h
+++ b/include/tgbot/types/InlineQueryResultGame.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INLINEQUERYRESULTGAME_H
 #define TGBOT_INLINEQUERYRESULTGAME_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultGif.h b/include/tgbot/types/InlineQueryResultGif.h
index 2d92050..e957d0f 100644
--- a/include/tgbot/types/InlineQueryResultGif.h
+++ b/include/tgbot/types/InlineQueryResultGif.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTGIF_H
 #define TGBOT_INLINEQUERYRESULTGIF_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultLocation.h b/include/tgbot/types/InlineQueryResultLocation.h
index f6f4014..31c27cc 100644
--- a/include/tgbot/types/InlineQueryResultLocation.h
+++ b/include/tgbot/types/InlineQueryResultLocation.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTLOCATION_H
 #define TGBOT_INLINEQUERYRESULTLOCATION_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultPhoto.h b/include/tgbot/types/InlineQueryResultPhoto.h
index a15c069..4e03de6 100644
--- a/include/tgbot/types/InlineQueryResultPhoto.h
+++ b/include/tgbot/types/InlineQueryResultPhoto.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTPHOTO_H
 #define TGBOT_INLINEQUERYRESULTPHOTO_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InlineQueryResultVenue.h b/include/tgbot/types/InlineQueryResultVenue.h
index 2ed5a1b..d5edfd4 100644
--- a/include/tgbot/types/InlineQueryResultVenue.h
+++ b/include/tgbot/types/InlineQueryResultVenue.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_INLINEQUERYRESULTVENUE_H
 #define TGBOT_INLINEQUERYRESULTVENUE_H
 
+#include "tgbot/types/InlineQueryResult.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/InlineQueryResult.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InputMediaAnimation.h b/include/tgbot/types/InputMediaAnimation.h
index 9256b6b..8bfb85b 100644
--- a/include/tgbot/types/InputMediaAnimation.h
+++ b/include/tgbot/types/InputMediaAnimation.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INPUTMEDIAANIMATION_H
 #define TGBOT_INPUTMEDIAANIMATION_H
 
+#include "tgbot/types/InputMedia.h"
+
 #include <memory>
 #include <string>
 
-#include "tgbot/types/InputMedia.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InputMediaAudio.h b/include/tgbot/types/InputMediaAudio.h
index df098b9..6a4b653 100644
--- a/include/tgbot/types/InputMediaAudio.h
+++ b/include/tgbot/types/InputMediaAudio.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INPUTMEDIAAUDIO_H
 #define TGBOT_INPUTMEDIAAUDIO_H
 
+#include "tgbot/types/InputMedia.h"
+
 #include <memory>
 #include <string>
 
-#include "tgbot/types/InputMedia.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InputMediaDocument.h b/include/tgbot/types/InputMediaDocument.h
index 4e19f7a..a496d3b 100644
--- a/include/tgbot/types/InputMediaDocument.h
+++ b/include/tgbot/types/InputMediaDocument.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INPUTMEDIADOCUMENT_H
 #define TGBOT_INPUTMEDIADOCUMENT_H
 
+#include "tgbot/types/InputMedia.h"
+
 #include <memory>
 #include <string>
 
-#include "tgbot/types/InputMedia.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InputMediaPhoto.h b/include/tgbot/types/InputMediaPhoto.h
index f232c5b..6ef0c32 100644
--- a/include/tgbot/types/InputMediaPhoto.h
+++ b/include/tgbot/types/InputMediaPhoto.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INPUTMEDIAPHOTO_H
 #define TGBOT_INPUTMEDIAPHOTO_H
 
+#include "tgbot/types/InputMedia.h"
+
 #include <memory>
 #include <string>
 
-#include "tgbot/types/InputMedia.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/InputMediaVideo.h b/include/tgbot/types/InputMediaVideo.h
index 452878b..1aeaa6b 100644
--- a/include/tgbot/types/InputMediaVideo.h
+++ b/include/tgbot/types/InputMediaVideo.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_INPUTMEDIAVIDEO_H
 #define TGBOT_INPUTMEDIAVIDEO_H
 
+#include "tgbot/types/InputMedia.h"
+
 #include <memory>
 #include <string>
 
-#include "tgbot/types/InputMedia.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/LoginUrl.h b/include/tgbot/types/LoginUrl.h
index 6b29e5d..a816384 100644
--- a/include/tgbot/types/LoginUrl.h
+++ b/include/tgbot/types/LoginUrl.h
@@ -5,8 +5,8 @@
 #include <string>
 #include <vector>
 
+namespace TgBot {
 
-namespace TgBot{
     /**
      * @brief This object represents a Poll.
      *
@@ -36,6 +36,7 @@ namespace TgBot{
          */
         bool request_write_access;
     };
+
 }
 
 #endif //TGBOT_CPP_LOGINURL_H
diff --git a/include/tgbot/types/Message.h b/include/tgbot/types/Message.h
index 3221716..cde5aae 100644
--- a/include/tgbot/types/Message.h
+++ b/include/tgbot/types/Message.h
@@ -1,11 +1,6 @@
 #ifndef TGBOT_CPP_MESSAGE_H
 #define TGBOT_CPP_MESSAGE_H
 
-#include <cstdint>
-#include <string>
-#include <vector>
-#include <memory>
-
 #include "tgbot/types/Chat.h"
 #include "tgbot/types/User.h"
 #include "tgbot/types/Message.h"
@@ -26,6 +21,11 @@
 #include "tgbot/types/SuccessfulPayment.h"
 #include "tgbot/types/InlineKeyboardMarkup.h"
 
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <memory>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/MessageEntity.h b/include/tgbot/types/MessageEntity.h
index d885e9d..f12d2a7 100644
--- a/include/tgbot/types/MessageEntity.h
+++ b/include/tgbot/types/MessageEntity.h
@@ -1,10 +1,11 @@
 #ifndef TGBOT_MESSAGEENTITY_H
 #define TGBOT_MESSAGEENTITY_H
 
+#include "tgbot/types/User.h"
+
 #include <cstdint>
 #include <memory>
 #include <string>
-#include "tgbot/types/User.h"
 
 namespace TgBot {
 
diff --git a/include/tgbot/types/OrderInfo.h b/include/tgbot/types/OrderInfo.h
index bf33acb..cda9b6f 100644
--- a/include/tgbot/types/OrderInfo.h
+++ b/include/tgbot/types/OrderInfo.h
@@ -1,9 +1,10 @@
 #ifndef TGBOT_ORDERINFO_H
 #define TGBOT_ORDERINFO_H
 
+#include "tgbot/types/ShippingAddress.h"
+
 #include <string>
 #include <memory>
-#include "tgbot/types/ShippingAddress.h"
 
 namespace TgBot {
 
@@ -38,6 +39,7 @@ public:
      */
     ShippingAddress::Ptr shippingAddress;
 };
+
 }
 
 #endif //TGBOT_ORDERINFO_H
diff --git a/include/tgbot/types/Poll.h b/include/tgbot/types/Poll.h
index c4781a8..9f4b04d 100644
--- a/include/tgbot/types/Poll.h
+++ b/include/tgbot/types/Poll.h
@@ -1,11 +1,12 @@
 #ifndef TGBOT_POLL_H
 #define TGBOT_POLL_H
 
+#include "tgbot/types/PollOption.h"
+
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
-#include "tgbot/types/PollOption.h"
 
 namespace TgBot {
     /**
diff --git a/include/tgbot/types/PreCheckoutQuery.h b/include/tgbot/types/PreCheckoutQuery.h
index bd95654..ce84ae9 100644
--- a/include/tgbot/types/PreCheckoutQuery.h
+++ b/include/tgbot/types/PreCheckoutQuery.h
@@ -1,12 +1,13 @@
 #ifndef TGBOT_PRECHECKOUTQUERY_H
 #define TGBOT_PRECHECKOUTQUERY_H
 
+#include "tgbot/types/User.h"
+#include "tgbot/types/OrderInfo.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 #include <vector>
-#include "tgbot/types/User.h"
-#include "tgbot/types/OrderInfo.h"
 
 namespace TgBot {
 
diff --git a/include/tgbot/types/ReplyKeyboardMarkup.h b/include/tgbot/types/ReplyKeyboardMarkup.h
index 567693d..2b65b13 100644
--- a/include/tgbot/types/ReplyKeyboardMarkup.h
+++ b/include/tgbot/types/ReplyKeyboardMarkup.h
@@ -1,13 +1,13 @@
 #ifndef TGBOT_CPP_REPLYKEYBOARDMARKUP_H
 #define TGBOT_CPP_REPLYKEYBOARDMARKUP_H
 
+#include "tgbot/types/GenericReply.h"
+#include "tgbot/types/KeyboardButton.h"
+
 #include <string>
 #include <vector>
 #include <memory>
 
-#include "tgbot/types/GenericReply.h"
-#include "tgbot/types/KeyboardButton.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/ReplyKeyboardRemove.h b/include/tgbot/types/ReplyKeyboardRemove.h
index e43bb22..4522bda 100644
--- a/include/tgbot/types/ReplyKeyboardRemove.h
+++ b/include/tgbot/types/ReplyKeyboardRemove.h
@@ -1,10 +1,10 @@
 #ifndef TGBOT_CPP_REPLYKEYBOARDREMOVE_H
 #define TGBOT_CPP_REPLYKEYBOARDREMOVE_H
 
-#include <memory>
-
 #include "tgbot/types/GenericReply.h"
 
+#include <memory>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/ShippingOption.h b/include/tgbot/types/ShippingOption.h
index 14411eb..8f09b76 100644
--- a/include/tgbot/types/ShippingOption.h
+++ b/include/tgbot/types/ShippingOption.h
@@ -1,10 +1,11 @@
 #ifndef TGBOT_SHIPPINGOPTION_H
 #define TGBOT_SHIPPINGOPTION_H
 
+#include "tgbot/types/LabeledPrice.h"
+
 #include <string>
 #include <memory>
 #include <vector>
-#include "tgbot/types/LabeledPrice.h"
 
 namespace TgBot {
 
diff --git a/include/tgbot/types/ShippingQuery.h b/include/tgbot/types/ShippingQuery.h
index 61c938b..7a0c4e1 100644
--- a/include/tgbot/types/ShippingQuery.h
+++ b/include/tgbot/types/ShippingQuery.h
@@ -1,11 +1,12 @@
 #ifndef TGBOT_SHIPPINGQUERY_H
 #define TGBOT_SHIPPINGQUERY_H
 
+#include "tgbot/types/User.h"
+#include "tgbot/types/ShippingAddress.h"
+
 #include <string>
 #include <memory>
 #include <vector>
-#include "tgbot/types/User.h"
-#include "tgbot/types/ShippingAddress.h"
 
 namespace TgBot {
 
diff --git a/include/tgbot/types/Sticker.h b/include/tgbot/types/Sticker.h
index 3ae2c50..b1d5945 100644
--- a/include/tgbot/types/Sticker.h
+++ b/include/tgbot/types/Sticker.h
@@ -1,13 +1,13 @@
 #ifndef TGBOT_CPP_STICKER_H
 #define TGBOT_CPP_STICKER_H
 
+#include "tgbot/types/PhotoSize.h"
+#include "tgbot/types/MaskPosition.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/PhotoSize.h"
-#include "tgbot/types/MaskPosition.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/StickerSet.h b/include/tgbot/types/StickerSet.h
index c9b823b..a5c6c53 100644
--- a/include/tgbot/types/StickerSet.h
+++ b/include/tgbot/types/StickerSet.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_STICKERSET_H
 #define TGBOT_STICKERSET_H
 
+#include "tgbot/types/Sticker.h"
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "tgbot/types/Sticker.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/SuccessfulPayment.h b/include/tgbot/types/SuccessfulPayment.h
index 06d2a9a..748adea 100644
--- a/include/tgbot/types/SuccessfulPayment.h
+++ b/include/tgbot/types/SuccessfulPayment.h
@@ -1,11 +1,12 @@
 #ifndef TGBOT_SUCCESSFULPAYMENT_H
 #define TGBOT_SUCCESSFULPAYMENT_H
 
+#include "tgbot/types/OrderInfo.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 #include <vector>
-#include "tgbot/types/OrderInfo.h"
 
 namespace TgBot {
 
diff --git a/include/tgbot/types/Update.h b/include/tgbot/types/Update.h
index fbd4f86..fa5f8f3 100644
--- a/include/tgbot/types/Update.h
+++ b/include/tgbot/types/Update.h
@@ -1,9 +1,6 @@
 #ifndef TGBOT_CPP_UPDATE_H
 #define TGBOT_CPP_UPDATE_H
 
-#include <cstdint>
-#include <memory>
-
 #include "tgbot/types/Message.h"
 #include "tgbot/types/InlineQuery.h"
 #include "tgbot/types/ChosenInlineResult.h"
@@ -11,6 +8,9 @@
 #include "tgbot/types/ShippingQuery.h"
 #include "tgbot/types/PreCheckoutQuery.h"
 
+#include <cstdint>
+#include <memory>
+
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/UserProfilePhotos.h b/include/tgbot/types/UserProfilePhotos.h
index 8816505..717ca93 100644
--- a/include/tgbot/types/UserProfilePhotos.h
+++ b/include/tgbot/types/UserProfilePhotos.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CPP_USERPROFILEPHOTOS_H
 #define TGBOT_CPP_USERPROFILEPHOTOS_H
 
+#include "tgbot/types/PhotoSize.h"
+
 #include <cstdint>
 #include <vector>
 #include <memory>
 
-#include "tgbot/types/PhotoSize.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/Venue.h b/include/tgbot/types/Venue.h
index 3192662..9e1ff81 100644
--- a/include/tgbot/types/Venue.h
+++ b/include/tgbot/types/Venue.h
@@ -1,11 +1,11 @@
 #ifndef TGBOT_VENUE_H
 #define TGBOT_VENUE_H
 
+#include "tgbot/types/Location.h"
+
 #include <memory>
 #include <string>
 
-#include "tgbot/types/Location.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/Video.h b/include/tgbot/types/Video.h
index 349adab..1702c5b 100644
--- a/include/tgbot/types/Video.h
+++ b/include/tgbot/types/Video.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CPP_VIDEO_H
 #define TGBOT_CPP_VIDEO_H
 
+#include "tgbot/types/PhotoSize.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/PhotoSize.h"
-
 namespace TgBot {
 
 /**
diff --git a/include/tgbot/types/VideoNote.h b/include/tgbot/types/VideoNote.h
index 327b8f6..ebdf0cb 100644
--- a/include/tgbot/types/VideoNote.h
+++ b/include/tgbot/types/VideoNote.h
@@ -1,12 +1,12 @@
 #ifndef TGBOT_CPP_VIDEONOTE_H
 #define TGBOT_CPP_VIDEONOTE_H
 
+#include "tgbot/types/PhotoSize.h"
+
 #include <cstdint>
 #include <string>
 #include <memory>
 
-#include "tgbot/types/PhotoSize.h"
-
 namespace TgBot {
 
 /**