diff --git a/src/source.cc b/src/source.cc
index a2c9c7e..7075694 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -41,6 +41,8 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path
       language=language_manager->get_language("cmake");
     else if(filename=="Makefile")
       language=language_manager->get_language("makefile");
+    else if(file_path.extension()==".tcc")
+      language=language_manager->get_language("cpphdr");
   }
   return language;
 }
diff --git a/src/source_clang.cc b/src/source_clang.cc
index 0bced19..7298c38 100644
--- a/src/source_clang.cc
+++ b/src/source_clang.cc
@@ -235,7 +235,9 @@ std::vector<std::string> Source::ClangViewParse::get_compilation_commands() {
 #endif
   }
   arguments.emplace_back("-fretain-comments-from-system-headers");
-  if(file_path.extension()==".h") //TODO: temporary fix for .h-files (parse as c++)
+  auto file_path_extension=file_path.extension();
+  if(file_path_extension==".h" || //TODO: temporary fix for .h-files (parse as c++)
+     file_path_extension==".tcc")
     arguments.emplace_back("-xc++");
   if(language && (language->get_id()=="chdr" || language->get_id()=="cpphdr"))
     arguments.emplace_back("-Wno-pragma-once-outside-header");