diff --git a/.gitattributes b/.gitattributes
index a916ed4a..2ed11bcb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,7 +17,17 @@
 *.java text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.py text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.swift text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.cs text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.xaml text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.appxmanifest text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.json text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.csproj text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.sln text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.xml text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 
 sqlite/sqlite/* linguist-vendored
 
 *.tlo binary
+
+*.pfx binary
+*.png binary
diff --git a/example/uwp/SDKManifest.xml b/example/uwp/SDKManifest.xml
index dfa8907b..e3b33e67 100644
--- a/example/uwp/SDKManifest.xml
+++ b/example/uwp/SDKManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <FileList
-    DisplayName="TDLib for Universal Windows Platfrom"
+    DisplayName="TDLib for Universal Windows Platform"
     ProductFamilyName="TDLib.UWP"
     MoreInfo="https://core.telegram.org/tdlib"
     MinVSVersion="14.0"
diff --git a/example/uwp/app/App.xaml b/example/uwp/app/App.xaml
index 97581ed7..b4256fd4 100644
--- a/example/uwp/app/App.xaml
+++ b/example/uwp/app/App.xaml
@@ -4,5 +4,4 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:TdApp"
     RequestedTheme="Light">
-
 </Application>
diff --git a/example/uwp/app/MainPage.xaml b/example/uwp/app/MainPage.xaml
index b2bdf58e..cdff97d9 100644
--- a/example/uwp/app/MainPage.xaml
+++ b/example/uwp/app/MainPage.xaml
@@ -22,7 +22,7 @@
             <Button Grid.Column="1" x:Name="Send" Content="send" Click="Button_Click"/>
         </Grid>
         <ListBox Grid.Row="1" x:Name="ItemsControl" ItemsSource="{Binding Items, ElementName=Self}">
-            
+
         </ListBox>
         <!--<Button Content="Test" Click="Button_Click"/>-->
     </Grid>
diff --git a/example/uwp/app/Properties/AssemblyInfo.cs b/example/uwp/app/Properties/AssemblyInfo.cs
index dfc4e738..99e2b83b 100644
--- a/example/uwp/app/Properties/AssemblyInfo.cs
+++ b/example/uwp/app/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("App2")]
@@ -10,18 +10,18 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("App2")]
-[assembly: AssemblyCopyright("Copyright © 2015-2017")]
+[assembly: AssemblyCopyright("Copyright © 2015-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
diff --git a/example/uwp/app/Properties/Default.rd.xml b/example/uwp/app/Properties/Default.rd.xml
index 80a960ce..479eb766 100644
--- a/example/uwp/app/Properties/Default.rd.xml
+++ b/example/uwp/app/Properties/Default.rd.xml
@@ -22,8 +22,8 @@
       the application package. The asterisks are not wildcards.
     -->
     <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
+
+
     <!-- Add your application specific runtime directives here. -->
 
 
diff --git a/example/uwp/app/TdApp.csproj b/example/uwp/app/TdApp.csproj
index e41e66d0..b2b2901e 100644
--- a/example/uwp/app/TdApp.csproj
+++ b/example/uwp/app/TdApp.csproj
@@ -141,7 +141,7 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/td/telegram/DeviceTokenManager.cpp b/td/telegram/DeviceTokenManager.cpp
index 8935c040..8182d6da 100644
--- a/td/telegram/DeviceTokenManager.cpp
+++ b/td/telegram/DeviceTokenManager.cpp
@@ -15,6 +15,7 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/base64.h"
+#include "td/utils/buffer.h"
 #include "td/utils/format.h"
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/files/FileLoadManager.cpp b/td/telegram/files/FileLoadManager.cpp
index d4c57098..85ef8359 100644
--- a/td/telegram/files/FileLoadManager.cpp
+++ b/td/telegram/files/FileLoadManager.cpp
@@ -10,6 +10,7 @@
 
 #include "td/utils/common.h"
 #include "td/utils/filesystem.h"
+#include "td/utils/format.h"
 #include "td/utils/logging.h"
 
 namespace td {
diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
index 52d2dcac..1fbc34df 100644
--- a/tdutils/CMakeLists.txt
+++ b/tdutils/CMakeLists.txt
@@ -129,6 +129,7 @@ set(TDUTILS_SOURCE
   td/utils/common.h
   td/utils/Container.h
   td/utils/crypto.h
+  td/utils/Enumerator.h
   td/utils/FileLog.h
   td/utils/filesystem.h
   td/utils/find_boundary.h
diff --git a/tdutils/td/utils/Enumerator.h b/tdutils/td/utils/Enumerator.h
index a38fc542..a3daf137 100644
--- a/tdutils/td/utils/Enumerator.h
+++ b/tdutils/td/utils/Enumerator.h
@@ -5,10 +5,13 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 #pragma once
+
 #include "td/utils/common.h"
+#include "td/utils/logging.h"
 #include "td/utils/misc.h"
 
 #include <set>
+#include <utility>
 
 namespace td {
 
diff --git a/tdutils/test/Enumerator.cpp b/tdutils/test/Enumerator.cpp
index e087fe22..b6174854 100644
--- a/tdutils/test/Enumerator.cpp
+++ b/tdutils/test/Enumerator.cpp
@@ -5,9 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 #include "td/utils/Enumerator.h"
-#include "td/utils/logging.h"
-#include "td/utils/port/thread.h"
-#include "td/utils/Random.h"
 #include "td/utils/tests.h"
 
 TEST(Enumerator, simple) {