diff --git a/.gitignore b/.gitignore
index fd44deed69..1aa7e98b86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ project.xcworkspace
 xcuserdata
 
 /Telegram/*.user.*
+*.pro.user
 /Linux/
 /Telegram/Makefile
 *.*~
diff --git a/Telegram/SourceFiles/codegen/style/generator.cpp b/Telegram/SourceFiles/codegen/style/generator.cpp
index 6609ef5726..7db0d19938 100644
--- a/Telegram/SourceFiles/codegen/style/generator.cpp
+++ b/Telegram/SourceFiles/codegen/style/generator.cpp
@@ -20,9 +20,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #include "codegen/style/generator.h"
 
+#include <memory>
+#include <functional>
 #include <QtCore/QDir>
 #include <QtCore/QSet>
-#include <functional>
 #include "codegen/style/parsed_file.h"
 
 using Module = codegen::style::structure::Module;
@@ -54,7 +55,7 @@ char hexFirstChar(char ch) {
 QString stringToEncodedString(const std::string &str) {
 	QString result;
 	result.reserve(str.size() * 4);
-	for (auto ch : str) {
+	for (uchar ch : str) {
 		if (ch == '\n') {
 			result.append("\\n");
 		} else if (ch == '\t') {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
index cf98a37ff7..5da9808faa 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
@@ -43,7 +43,7 @@ private:
 
 public:
 
-	// Constructor is public only for std::make_unique<>() to work.
+	// Constructor is public only for std_::make_unique<>() to work.
 	// You should use create() static method instead.
 	explicit Result(const Creator &creator);
 	static std_::unique_ptr<Result> create(uint64 queryId, const MTPBotInlineResult &mtpData);
diff --git a/Telegram/build/qmake/codegen_numbers/codegen_numbers.pro b/Telegram/build/qmake/codegen_numbers/codegen_numbers.pro
new file mode 100644
index 0000000000..c7da68a132
--- /dev/null
+++ b/Telegram/build/qmake/codegen_numbers/codegen_numbers.pro
@@ -0,0 +1,45 @@
+QT += core gui
+
+TARGET = codegen_numbers
+CONFIG += console static c++14
+CONFIG -= app_bundle
+
+CONFIG(debug, debug|release) {
+    OBJECTS_DIR = ./
+    DESTDIR = ./../../../codegen/Debug
+}
+CONFIG(release, debug|release) {
+    OBJECTS_DIR = ./
+    DESTDIR = ./../../../codegen/Release
+}
+
+INCLUDEPATH += ./../../../SourceFiles
+
+QMAKE_CFLAGS_WARN_ON += -Wno-missing-field-initializers
+QMAKE_CXXFLAGS_WARN_ON += -Wno-missing-field-initializers
+
+TEMPLATE = app
+
+SOURCES += \
+./../../../SourceFiles/codegen/common/basic_tokenized_file.cpp\
+./../../../SourceFiles/codegen/common/checked_utf8_string.cpp\
+./../../../SourceFiles/codegen/common/clean_file.cpp\
+./../../../SourceFiles/codegen/common/cpp_file.cpp\
+./../../../SourceFiles/codegen/common/logging.cpp\
+./../../../SourceFiles/codegen/numbers/generator.cpp\
+./../../../SourceFiles/codegen/numbers/main.cpp\
+./../../../SourceFiles/codegen/numbers/options.cpp\
+./../../../SourceFiles/codegen/numbers/parsed_file.cpp\
+./../../../SourceFiles/codegen/numbers/processor.cpp
+
+HEADERS += \
+./../../../SourceFiles/codegen/common/basic_tokenized_file.h\
+./../../../SourceFiles/codegen/common/checked_utf8_string.h\
+./../../../SourceFiles/codegen/common/clean_file.h\
+./../../../SourceFiles/codegen/common/clean_file_reader.h\
+./../../../SourceFiles/codegen/common/cpp_file.h\
+./../../../SourceFiles/codegen/common/logging.h\
+./../../../SourceFiles/codegen/numbers/generator.h\
+./../../../SourceFiles/codegen/numbers/options.h\
+./../../../SourceFiles/codegen/numbers/parsed_file.h\
+./../../../SourceFiles/codegen/numbers/processor.h
diff --git a/Telegram/build/qmake/codegen_style/codegen_style.pro b/Telegram/build/qmake/codegen_style/codegen_style.pro
new file mode 100644
index 0000000000..ebfdd1ebee
--- /dev/null
+++ b/Telegram/build/qmake/codegen_style/codegen_style.pro
@@ -0,0 +1,51 @@
+QT += core gui
+
+TARGET = codegen_style
+CONFIG += console static c++14
+CONFIG -= app_bundle
+
+CONFIG(debug, debug|release) {
+    OBJECTS_DIR = ./
+    DESTDIR = ./../../../codegen/Debug
+}
+CONFIG(release, debug|release) {
+    OBJECTS_DIR = ./
+    DESTDIR = ./../../../codegen/Release
+}
+
+INCLUDEPATH += ./../../../SourceFiles
+
+QMAKE_CFLAGS_WARN_ON += -Wno-missing-field-initializers
+QMAKE_CXXFLAGS_WARN_ON += -Wno-missing-field-initializers
+
+TEMPLATE = app
+
+SOURCES += \
+./../../../SourceFiles/codegen/common/basic_tokenized_file.cpp\
+./../../../SourceFiles/codegen/common/checked_utf8_string.cpp\
+./../../../SourceFiles/codegen/common/clean_file.cpp\
+./../../../SourceFiles/codegen/common/cpp_file.cpp\
+./../../../SourceFiles/codegen/common/logging.cpp\
+./../../../SourceFiles/codegen/style/generator.cpp\
+./../../../SourceFiles/codegen/style/main.cpp\
+./../../../SourceFiles/codegen/style/module.cpp\
+./../../../SourceFiles/codegen/style/options.cpp\
+./../../../SourceFiles/codegen/style/parsed_file.cpp\
+./../../../SourceFiles/codegen/style/processor.cpp\
+./../../../SourceFiles/codegen/style/sprite_generator.cpp\
+./../../../SourceFiles/codegen/style/structure_types.cpp
+
+HEADERS += \
+./../../../SourceFiles/codegen/common/basic_tokenized_file.h\
+./../../../SourceFiles/codegen/common/checked_utf8_string.h\
+./../../../SourceFiles/codegen/common/clean_file.h\
+./../../../SourceFiles/codegen/common/clean_file_reader.h\
+./../../../SourceFiles/codegen/common/cpp_file.h\
+./../../../SourceFiles/codegen/common/logging.h\
+./../../../SourceFiles/codegen/style/generator.h\
+./../../../SourceFiles/codegen/style/module.h\
+./../../../SourceFiles/codegen/style/options.h\
+./../../../SourceFiles/codegen/style/parsed_file.h\
+./../../../SourceFiles/codegen/style/processor.h\
+./../../../SourceFiles/codegen/style/sprite_generator.h\
+./../../../SourceFiles/codegen/style/structure_types.h