diff --git a/src/source_clang.cc b/src/source_clang.cc
index 9b03afc..d7a648e 100644
--- a/src/source_clang.cc
+++ b/src/source_clang.cc
@@ -21,7 +21,7 @@ namespace sigc {
 clang::Index Source::ClangViewParse::clang_index(0, 0);
 
 Source::ClangViewParse::ClangViewParse(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path, Glib::RefPtr<Gsv::Language> language):
-Source::View(file_path, project_path, language), parse_error(false), first_time_reparse_status(0) {
+Source::View(file_path, project_path, language), parse_error(false) {
   JDEBUG("start");
   
   auto tag_table=get_buffer()->get_tag_table();
@@ -113,6 +113,24 @@ void Source::ClangViewParse::init_parse() {
   parse_thread_mapped=false;
   parse_thread_stop=false;
   
+  auto buffer_map=get_buffer_map();
+  //Remove includes for first parse for initial syntax highlighting
+  auto& str=buffer_map[file_path.string()];
+  std::size_t pos=0;
+  while((pos=str.find("#include", pos))!=std::string::npos) {
+    auto start_pos=pos;
+    pos=str.find('\n', pos+8);
+    if(pos==std::string::npos)
+      break;
+    if(start_pos==0 || str[start_pos-1]=='\n') {
+      str.replace(start_pos, pos-start_pos, pos-start_pos, ' ');
+    }
+    pos++;
+  }
+  clang_tu = std::unique_ptr<clang::TranslationUnit>(new clang::TranslationUnit(clang_index, file_path.string(), get_compilation_commands(), buffer_map));
+  clang_tokens=clang_tu->get_tokens(0, buffer_map.find(file_path.string())->second.size()-1);
+  update_syntax();
+  
   set_status("parsing...");
   if(parse_thread.joinable())
     parse_thread.join();
@@ -127,13 +145,7 @@ void Source::ClangViewParse::init_parse() {
         parse_start();
       }
       else if (parse_thread_mapped && parsing_mutex.try_lock() && parse_thread_buffer_map_mutex.try_lock()) {
-        int status=0;
-        if(!clang_tu)
-          clang_tu = std::unique_ptr<clang::TranslationUnit>(new clang::TranslationUnit(clang_index, file_path.string(), get_compilation_commands(), parse_thread_buffer_map));
-        else {
-          status=clang_tu->ReparseTranslationUnit(parse_thread_buffer_map);
-          first_time_reparse_status=2;
-        }
+        auto status=clang_tu->ReparseTranslationUnit(parse_thread_buffer_map);
         if(status==0)
           clang_tokens=clang_tu->get_tokens(0, parse_thread_buffer_map.find(file_path.string())->second.size()-1);
         else
@@ -161,20 +173,13 @@ std::map<std::string, std::string> Source::ClangViewParse::get_buffer_map() cons
 void Source::ClangViewParse::start_reparse() {
   parse_thread_mapped=false;
   source_readable=false;
-  int delay;
-  if(first_time_reparse_status==0) {
-    first_time_reparse_status=1;
-    delay=0;
-  }
-  else
-    delay=1000;
   delayed_reparse_connection.disconnect();
   delayed_reparse_connection=Glib::signal_timeout().connect([this]() {
     source_readable=false;
     parse_thread_go=true;
     set_status("parsing...");
     return false;
-  }, delay);
+  }, 1000);
 }
 
 std::vector<std::string> Source::ClangViewParse::get_compilation_commands() {
@@ -818,8 +823,6 @@ void Source::ClangViewAutocomplete::autocomplete() {
     if(autocomplete_thread.joinable())
       autocomplete_thread.join();
     autocomplete_thread=std::thread([this, ac_data, line_nr, column_nr, buffer_map](){
-      while(first_time_reparse_status!=2)
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
       parsing_mutex.lock();
       if(!parse_thread_stop)
         *ac_data=get_autocomplete_suggestions(line_nr, column_nr, *buffer_map);
diff --git a/src/source_clang.h b/src/source_clang.h
index 3a80aa4..20c8214 100644
--- a/src/source_clang.h
+++ b/src/source_clang.h
@@ -38,7 +38,6 @@ namespace Source {
     std::thread parse_thread;
     std::atomic<bool> parse_thread_stop;
     std::atomic<bool> parse_error;
-    std::atomic<unsigned short> first_time_reparse_status; ///0: not reparsed, 1: will be reparsed, 2: reparsed
     
     virtual void show_diagnostic_tooltips(const Gdk::Rectangle &rectangle);
     virtual void show_type_tooltips(const Gdk::Rectangle &rectangle);