diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ba0ccf..682665f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,18 +1,18 @@
 add_library(clangmm
-  code_complete_results.cc
-  compilation_database.cc
-  compile_command.cc
-  compile_commands.cc
-  completion_string.cc
-  cursor.cc
-  index.cc
-  source_location.cc
-  source_range.cc
-  token.cc
-  tokens.cc
-  translation_unit.cc
-  diagnostic.cc
-  utility.cc
+  code_complete_results.cpp
+  compilation_database.cpp
+  compile_command.cpp
+  compile_commands.cpp
+  completion_string.cpp
+  cursor.cpp
+  index.cpp
+  source_location.cpp
+  source_range.cpp
+  token.cpp
+  tokens.cpp
+  translation_unit.cpp
+  diagnostic.cpp
+  utility.cpp
 )
 
 include_directories(${LIBCLANG_INCLUDE_DIRS})
@@ -22,21 +22,21 @@ target_include_directories(clangmm PUBLIC ${LIBCLANG_INCLUDE_DIRS} .)
 if(${NOT_SUB_PROJECT})
   install(TARGETS clangmm ARCHIVE DESTINATION lib)
   install(FILES
-    clangmm.h
-    code_complete_results.h
-    compilation_database.h
-    compile_command.h
-    compile_commands.h
-    completion_string.h
-    cursor.h
-    index.h
-    source_location.h
-    source_range.h
-    token.h
-    tokens.h
-    translation_unit.h
-    diagnostic.h
-    utility.h
+    clangmm.hpp
+    code_complete_results.hpp
+    compilation_database.hpp
+    compile_command.hpp
+    compile_commands.hpp
+    completion_string.hpp
+    cursor.hpp
+    index.hpp
+    source_location.hpp
+    source_range.hpp
+    token.hpp
+    tokens.hpp
+    translation_unit.hpp
+    diagnostic.hpp
+    utility.hpp
     DESTINATION include/libclangmm
   )
 endif()
diff --git a/src/clangmm.h b/src/clangmm.h
deleted file mode 100644
index 80a0597..0000000
--- a/src/clangmm.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef CLANGMM_H_
-#define CLANGMM_H_
-#include "code_complete_results.h"
-#include "compilation_database.h"
-#include "compile_command.h"
-#include "compile_commands.h"
-#include "completion_string.h"
-#include "cursor.h"
-#include "diagnostic.h"
-#include "index.h"
-#include "source_location.h"
-#include "source_range.h"
-#include "token.h"
-#include "tokens.h"
-#include "translation_unit.h"
-#include "utility.h"
-#endif // CLANGMM_H_
diff --git a/src/clangmm.hpp b/src/clangmm.hpp
new file mode 100644
index 0000000..9826c29
--- /dev/null
+++ b/src/clangmm.hpp
@@ -0,0 +1,17 @@
+#ifndef CLANGMM_H_
+#define CLANGMM_H_
+#include "code_complete_results.hpp"
+#include "compilation_database.hpp"
+#include "compile_command.hpp"
+#include "compile_commands.hpp"
+#include "completion_string.hpp"
+#include "cursor.hpp"
+#include "diagnostic.hpp"
+#include "index.hpp"
+#include "source_location.hpp"
+#include "source_range.hpp"
+#include "token.hpp"
+#include "tokens.hpp"
+#include "translation_unit.hpp"
+#include "utility.hpp"
+#endif // CLANGMM_H_
diff --git a/src/code_complete_results.cc b/src/code_complete_results.cpp
similarity index 95%
rename from src/code_complete_results.cc
rename to src/code_complete_results.cpp
index f3923d9..162c3e0 100644
--- a/src/code_complete_results.cc
+++ b/src/code_complete_results.cpp
@@ -1,6 +1,6 @@
-#include "code_complete_results.h"
-#include "completion_string.h"
-#include "utility.h"
+#include "code_complete_results.hpp"
+#include "completion_string.hpp"
+#include "utility.hpp"
 
 clangmm::CodeCompleteResults::CodeCompleteResults(CXTranslationUnit &cx_tu,
                                                   const std::string &buffer,
diff --git a/src/code_complete_results.h b/src/code_complete_results.hpp
similarity index 96%
rename from src/code_complete_results.h
rename to src/code_complete_results.hpp
index 0652de4..051b97a 100644
--- a/src/code_complete_results.h
+++ b/src/code_complete_results.hpp
@@ -1,6 +1,6 @@
 #ifndef CODECOMPLETERESULTS_H_
 #define CODECOMPLETERESULTS_H_
-#include "completion_string.h"
+#include "completion_string.hpp"
 #include <clang-c/Index.h>
 #include <map>
 #include <string>
diff --git a/src/compilation_database.cc b/src/compilation_database.cpp
similarity index 91%
rename from src/compilation_database.cc
rename to src/compilation_database.cpp
index f12659c..b788134 100644
--- a/src/compilation_database.cc
+++ b/src/compilation_database.cpp
@@ -1,4 +1,4 @@
-#include "compilation_database.h"
+#include "compilation_database.hpp"
 #include <exception>
 
 clangmm::CompilationDatabase::CompilationDatabase(const std::string &project_path) {
diff --git a/src/compilation_database.h b/src/compilation_database.hpp
similarity index 100%
rename from src/compilation_database.h
rename to src/compilation_database.hpp
diff --git a/src/compile_command.cc b/src/compile_command.cpp
similarity index 78%
rename from src/compile_command.cc
rename to src/compile_command.cpp
index cafa6bf..bf6b0c9 100644
--- a/src/compile_command.cc
+++ b/src/compile_command.cpp
@@ -1,6 +1,6 @@
-#include "compile_command.h"
-#include "compile_commands.h"
-#include "utility.h"
+#include "compile_command.hpp"
+#include "compile_commands.hpp"
+#include "utility.hpp"
 
 std::vector<std::string> clangmm::CompileCommand::get_arguments() {
   unsigned size = clang_CompileCommand_getNumArgs(cx_command);
diff --git a/src/compile_command.h b/src/compile_command.hpp
similarity index 100%
rename from src/compile_command.h
rename to src/compile_command.hpp
diff --git a/src/compile_commands.cc b/src/compile_commands.cpp
similarity index 96%
rename from src/compile_commands.cc
rename to src/compile_commands.cpp
index e6ba74b..db30bfa 100644
--- a/src/compile_commands.cc
+++ b/src/compile_commands.cpp
@@ -1,4 +1,4 @@
-#include "compile_commands.h"
+#include "compile_commands.hpp"
 
 clangmm::CompileCommands::CompileCommands(const std::string &filename, CompilationDatabase &db) {
   if(!filename.empty())
diff --git a/src/compile_commands.h b/src/compile_commands.hpp
similarity index 86%
rename from src/compile_commands.h
rename to src/compile_commands.hpp
index 83e50c5..71e6be5 100644
--- a/src/compile_commands.h
+++ b/src/compile_commands.hpp
@@ -1,7 +1,7 @@
 #ifndef COMPILECOMMANDS_H_
 #define COMPILECOMMANDS_H_
-#include "compilation_database.h"
-#include "compile_command.h"
+#include "compilation_database.hpp"
+#include "compile_command.hpp"
 #include <clang-c/CXCompilationDatabase.h>
 #include <string>
 #include <vector>
diff --git a/src/completion_string.cc b/src/completion_string.cpp
similarity index 98%
rename from src/completion_string.cc
rename to src/completion_string.cpp
index cda0050..96ff78b 100644
--- a/src/completion_string.cc
+++ b/src/completion_string.cpp
@@ -1,5 +1,5 @@
-#include "completion_string.h"
-#include "utility.h"
+#include "completion_string.hpp"
+#include "utility.hpp"
 
 clangmm::CompletionChunk::CompletionChunk(std::string text, CompletionChunkKind kind)
     : text(std::move(text)), kind(kind) {}
diff --git a/src/completion_string.h b/src/completion_string.hpp
similarity index 98%
rename from src/completion_string.h
rename to src/completion_string.hpp
index c14c4be..44dffef 100644
--- a/src/completion_string.h
+++ b/src/completion_string.hpp
@@ -1,6 +1,6 @@
 #ifndef COMPLETIONSTRING_H_
 #define COMPLETIONSTRING_H_
-#include "cursor.h"
+#include "cursor.hpp"
 #include <clang-c/Index.h>
 #include <string>
 #include <vector>
diff --git a/src/cursor.cc b/src/cursor.cpp
similarity index 99%
rename from src/cursor.cc
rename to src/cursor.cpp
index b8976ad..5f23a25 100644
--- a/src/cursor.cc
+++ b/src/cursor.cpp
@@ -1,5 +1,5 @@
-#include "cursor.h"
-#include "utility.h"
+#include "cursor.hpp"
+#include "utility.hpp"
 
 std::string clangmm::Cursor::Type::get_spelling() const {
   return to_string(clang_getTypeSpelling(cx_type));
diff --git a/src/cursor.h b/src/cursor.hpp
similarity index 99%
rename from src/cursor.h
rename to src/cursor.hpp
index 5d71f22..a0645d7 100644
--- a/src/cursor.h
+++ b/src/cursor.hpp
@@ -1,7 +1,7 @@
 #ifndef CURSOR_H_
 #define CURSOR_H_
-#include "source_location.h"
-#include "source_range.h"
+#include "source_location.hpp"
+#include "source_range.hpp"
 #include <clang-c/Index.h>
 #include <string>
 #include <unordered_set>
diff --git a/src/diagnostic.cc b/src/diagnostic.cpp
similarity index 91%
rename from src/diagnostic.cc
rename to src/diagnostic.cpp
index 715a721..0702a28 100644
--- a/src/diagnostic.cc
+++ b/src/diagnostic.cpp
@@ -1,7 +1,7 @@
-#include "diagnostic.h"
-#include "source_location.h"
-#include "tokens.h"
-#include "utility.h"
+#include "diagnostic.hpp"
+#include "source_location.hpp"
+#include "tokens.hpp"
+#include "utility.hpp"
 
 clangmm::Diagnostic::Diagnostic(CXTranslationUnit &cx_tu, CXDiagnostic &cx_diagnostic) {
   severity = static_cast<Severity>(clang_getDiagnosticSeverity(cx_diagnostic));
diff --git a/src/diagnostic.h b/src/diagnostic.hpp
similarity index 96%
rename from src/diagnostic.h
rename to src/diagnostic.hpp
index bee6aca..3a80164 100644
--- a/src/diagnostic.h
+++ b/src/diagnostic.hpp
@@ -1,6 +1,6 @@
 #ifndef DIAGNOSTIC_H_
 #define DIAGNOSTIC_H_
-#include "source_range.h"
+#include "source_range.hpp"
 #include <clang-c/Index.h>
 #include <string>
 #include <vector>
diff --git a/src/index.cc b/src/index.cpp
similarity index 91%
rename from src/index.cc
rename to src/index.cpp
index ff449bc..d83f3e9 100644
--- a/src/index.cc
+++ b/src/index.cpp
@@ -1,4 +1,4 @@
-#include "index.h"
+#include "index.hpp"
 
 clangmm::Index::Index(int excludeDeclarationsFromPCH, int displayDiagnostics) {
   cx_index = clang_createIndex(excludeDeclarationsFromPCH, displayDiagnostics);
diff --git a/src/index.h b/src/index.hpp
similarity index 100%
rename from src/index.h
rename to src/index.hpp
diff --git a/src/source_location.cc b/src/source_location.cpp
similarity index 95%
rename from src/source_location.cc
rename to src/source_location.cpp
index 3b0a8cc..52bd3ad 100644
--- a/src/source_location.cc
+++ b/src/source_location.cpp
@@ -1,5 +1,5 @@
-#include "source_location.h"
-#include "utility.h"
+#include "source_location.hpp"
+#include "utility.hpp"
 
 // // // // // // // //
 //  SourceLocation   //
diff --git a/src/source_location.h b/src/source_location.hpp
similarity index 100%
rename from src/source_location.h
rename to src/source_location.hpp
diff --git a/src/source_range.cc b/src/source_range.cpp
similarity index 95%
rename from src/source_range.cc
rename to src/source_range.cpp
index 6828843..fd53ea5 100644
--- a/src/source_range.cc
+++ b/src/source_range.cpp
@@ -1,4 +1,4 @@
-#include "source_range.h"
+#include "source_range.hpp"
 
 clangmm::SourceRange::SourceRange(const clangmm::SourceLocation &start, const clangmm::SourceLocation &end) {
   cx_range = clang_getRange(start.cx_location, end.cx_location);
diff --git a/src/source_range.h b/src/source_range.hpp
similarity index 95%
rename from src/source_range.h
rename to src/source_range.hpp
index d344e87..bdb3bda 100644
--- a/src/source_range.h
+++ b/src/source_range.hpp
@@ -1,6 +1,6 @@
 #ifndef SOURCERANGE_H_
 #define SOURCERANGE_H_
-#include "source_location.h"
+#include "source_location.hpp"
 #include <clang-c/Index.h>
 #include <string>
 #include <utility>
diff --git a/src/token.cc b/src/token.cpp
similarity index 97%
rename from src/token.cc
rename to src/token.cpp
index 47576ae..cc1f6b1 100644
--- a/src/token.cc
+++ b/src/token.cpp
@@ -1,5 +1,5 @@
-#include "token.h"
-#include "utility.h"
+#include "token.hpp"
+#include "utility.hpp"
 
 // // // // //
 //  Token   //
diff --git a/src/token.h b/src/token.hpp
similarity index 92%
rename from src/token.h
rename to src/token.hpp
index 0d2e5d9..5b6f513 100644
--- a/src/token.h
+++ b/src/token.hpp
@@ -1,8 +1,8 @@
 #ifndef TOKEN_H_
 #define TOKEN_H_
-#include "cursor.h"
-#include "source_location.h"
-#include "source_range.h"
+#include "cursor.hpp"
+#include "source_location.hpp"
+#include "source_range.hpp"
 #include <clang-c/Index.h>
 #include <string>
 
diff --git a/src/tokens.cc b/src/tokens.cpp
similarity index 99%
rename from src/tokens.cc
rename to src/tokens.cpp
index faf76ca..9bce535 100644
--- a/src/tokens.cc
+++ b/src/tokens.cpp
@@ -1,5 +1,5 @@
-#include "tokens.h"
-#include "utility.h"
+#include "tokens.hpp"
+#include "utility.hpp"
 #include <cstring>
 #include <map>
 #include <unordered_set>
diff --git a/src/tokens.h b/src/tokens.hpp
similarity index 94%
rename from src/tokens.h
rename to src/tokens.hpp
index 0fe86e8..1afec44 100644
--- a/src/tokens.h
+++ b/src/tokens.hpp
@@ -1,7 +1,7 @@
 #ifndef TOKENS_H_
 #define TOKENS_H_
-#include "source_range.h"
-#include "token.h"
+#include "source_range.hpp"
+#include "token.hpp"
 #include <clang-c/Index.h>
 #include <memory>
 #include <unordered_set>
diff --git a/src/translation_unit.cc b/src/translation_unit.cpp
similarity index 97%
rename from src/translation_unit.cc
rename to src/translation_unit.cpp
index 9b25b7e..98c684a 100644
--- a/src/translation_unit.cc
+++ b/src/translation_unit.cpp
@@ -1,7 +1,7 @@
-#include "translation_unit.h"
-#include "source_location.h"
-#include "tokens.h"
-#include "utility.h"
+#include "translation_unit.hpp"
+#include "source_location.hpp"
+#include "tokens.hpp"
+#include "utility.hpp"
 #include <fstream>
 #include <sstream>
 
diff --git a/src/translation_unit.h b/src/translation_unit.hpp
similarity index 92%
rename from src/translation_unit.h
rename to src/translation_unit.hpp
index 78dd75f..73397b4 100644
--- a/src/translation_unit.h
+++ b/src/translation_unit.hpp
@@ -1,10 +1,10 @@
 #ifndef TRANSLATIONUNIT_H_
 #define TRANSLATIONUNIT_H_
-#include "code_complete_results.h"
-#include "cursor.h"
-#include "diagnostic.h"
-#include "index.h"
-#include "tokens.h"
+#include "code_complete_results.hpp"
+#include "cursor.hpp"
+#include "diagnostic.hpp"
+#include "index.hpp"
+#include "tokens.hpp"
 #include <clang-c/Index.h>
 #include <map>
 #include <memory>
diff --git a/src/utility.cc b/src/utility.cpp
similarity index 99%
rename from src/utility.cc
rename to src/utility.cpp
index 8c52edc..d833ca6 100644
--- a/src/utility.cc
+++ b/src/utility.cpp
@@ -1,4 +1,4 @@
-#include "utility.h"
+#include "utility.hpp"
 #include <regex>
 
 std::string clangmm::to_string(CXString cx_string) {
diff --git a/src/utility.h b/src/utility.hpp
similarity index 100%
rename from src/utility.h
rename to src/utility.hpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5bf0e12..c27887d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,29 +1,29 @@
 add_definitions(-DLIBCLANGMM_TESTS_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_executable(code_complete_results_test code_complete_results_test.cc)
+add_executable(code_complete_results_test code_complete_results_test.cpp)
 target_link_libraries(code_complete_results_test clangmm)
 add_test(code_complete_results_test code_complete_results_test)
 
-add_executable(completion_string_test completion_string_test.cc)
+add_executable(completion_string_test completion_string_test.cpp)
 target_link_libraries(completion_string_test clangmm)
 add_test(completion_string_test completion_string_test)
 
-add_executable(cursor_test cursor_test.cc)
+add_executable(cursor_test cursor_test.cpp)
 target_link_libraries(cursor_test clangmm)
 add_test(cursor_test cursor_test)
 
-add_executable(diagnostics_test diagnostics_test.cc)
+add_executable(diagnostics_test diagnostics_test.cpp)
 target_link_libraries(diagnostics_test clangmm)
 add_test(diagnostics_test diagnostics_test)
 
-add_executable(source_location_test source_location_test.cc)
+add_executable(source_location_test source_location_test.cpp)
 target_link_libraries(source_location_test clangmm)
 add_test(source_location_test source_location_test)
 
-add_executable(token_test token_test.cc)
+add_executable(token_test token_test.cpp)
 target_link_libraries(token_test clangmm)
 add_test(token_test token_test)
 
-add_executable(translation_unit_test translation_unit_test.cc)
+add_executable(translation_unit_test translation_unit_test.cpp)
 target_link_libraries(translation_unit_test clangmm)
 add_test(translation_unit_test translation_unit_test)
diff --git a/tests/code_complete_results_test.cc b/tests/code_complete_results_test.cpp
similarity index 98%
rename from tests/code_complete_results_test.cc
rename to tests/code_complete_results_test.cpp
index b824f53..bc0269f 100644
--- a/tests/code_complete_results_test.cc
+++ b/tests/code_complete_results_test.cpp
@@ -1,4 +1,4 @@
-#include "clangmm.h"
+#include "clangmm.hpp"
 #include <cassert>
 #include <regex>
 #include <string>
diff --git a/tests/completion_string_test.cc b/tests/completion_string_test.cpp
similarity index 98%
rename from tests/completion_string_test.cc
rename to tests/completion_string_test.cpp
index 58245ba..a36abfc 100644
--- a/tests/completion_string_test.cc
+++ b/tests/completion_string_test.cpp
@@ -1,4 +1,4 @@
-#include "clangmm.h"
+#include "clangmm.hpp"
 #include <cassert>
 #include <regex>
 #include <string>
diff --git a/tests/cursor_test.cc b/tests/cursor_test.cpp
similarity index 97%
rename from tests/cursor_test.cc
rename to tests/cursor_test.cpp
index 3849a01..490d976 100644
--- a/tests/cursor_test.cc
+++ b/tests/cursor_test.cpp
@@ -1,4 +1,4 @@
-#include "clangmm.h"
+#include "clangmm.hpp"
 #include <cassert>
 #include <regex>
 #include <string>
diff --git a/tests/diagnostics_test.cc b/tests/diagnostics_test.cpp
similarity index 97%
rename from tests/diagnostics_test.cc
rename to tests/diagnostics_test.cpp
index c82971d..7102642 100644
--- a/tests/diagnostics_test.cc
+++ b/tests/diagnostics_test.cpp
@@ -1,4 +1,4 @@
-#include "clangmm.h"
+#include "clangmm.hpp"
 #include <cassert>
 #include <fstream>
 #include <iostream>
diff --git a/tests/source_location_test.cc b/tests/source_location_test.cpp
similarity index 95%
rename from tests/source_location_test.cc
rename to tests/source_location_test.cpp
index accdb9a..9804bf4 100644
--- a/tests/source_location_test.cc
+++ b/tests/source_location_test.cpp
@@ -1,4 +1,4 @@
-#include "clangmm.h"
+#include "clangmm.hpp"
 #include <cassert>
 #include <memory>
 #include <string>
diff --git a/tests/token_test.cc b/tests/token_test.cpp
similarity index 95%
rename from tests/token_test.cc
rename to tests/token_test.cpp
index d269235..6fd6fee 100644
--- a/tests/token_test.cc
+++ b/tests/token_test.cpp
@@ -1,4 +1,4 @@
-#include "clangmm.h"
+#include "clangmm.hpp"
 #include <cassert>
 #include <string>
 
diff --git a/tests/translation_unit_test.cc b/tests/translation_unit_test.cpp
similarity index 95%
rename from tests/translation_unit_test.cc
rename to tests/translation_unit_test.cpp
index 4525e7e..c62cc44 100644
--- a/tests/translation_unit_test.cc
+++ b/tests/translation_unit_test.cpp
@@ -1,4 +1,4 @@
-#include "clangmm.h"
+#include "clangmm.hpp"
 #include <cassert>
 #include <map>
 #include <string>