diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3748b26..7eac1f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 endif()
 
 # Project config file
-configure_file(config.h.in "${PROJECT_BINARY_DIR}/config.h" @ONLY)
+configure_file(config.hpp.in "${PROJECT_BINARY_DIR}/config.hpp" @ONLY)
 include_directories(${PROJECT_BINARY_DIR})
 
 # --------------------------------
diff --git a/cli/benchmark.cpp b/cli/benchmark.cpp
index da384a4..521184e 100644
--- a/cli/benchmark.cpp
+++ b/cli/benchmark.cpp
@@ -23,7 +23,7 @@
  */
 #include <chrono>
 #include <libeosio/ec.h>
-#include "benchmark.h"
+#include "benchmark.hpp"
 
 using std::chrono::steady_clock;
 using std::chrono::duration;
diff --git a/cli/benchmark.h b/cli/benchmark.hpp
similarity index 100%
rename from cli/benchmark.h
rename to cli/benchmark.hpp
diff --git a/cli/cli_key_search_result.cpp b/cli/cli_key_search_result.cpp
index 05d5b57..6817e59 100644
--- a/cli/cli_key_search_result.cpp
+++ b/cli/cli_key_search_result.cpp
@@ -24,8 +24,8 @@
 #include <iostream>
 #include <libeosio/WIF.h>
 #include <eoskeygen/core/dictionary.h>
-#include "console.h"
-#include "cli_key_search_result.h"
+#include "console.hpp"
+#include "cli_key_search_result.hpp"
 
 namespace eoskeygen {
 
diff --git a/cli/cli_key_search_result.h b/cli/cli_key_search_result.hpp
similarity index 100%
rename from cli/cli_key_search_result.h
rename to cli/cli_key_search_result.hpp
diff --git a/cli/console.cpp b/cli/console.cpp
index 2208856..2ed20da 100644
--- a/cli/console.cpp
+++ b/cli/console.cpp
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 #include <iostream>
-#include "isatty.h"
-#include "console.h"
+#include "isatty.hpp"
+#include "console.hpp"
 
 namespace eoskeygen { namespace console {
 
diff --git a/cli/console.h b/cli/console.hpp
similarity index 100%
rename from cli/console.h
rename to cli/console.hpp
diff --git a/cli/console_ansi.cpp b/cli/console_ansi.cpp
index 2d34980..75b5412 100644
--- a/cli/console_ansi.cpp
+++ b/cli/console_ansi.cpp
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 #include <iostream>
-#include "console.h"
+#include "console.hpp"
 
 namespace eoskeygen {
 
diff --git a/cli/console_win32.cpp b/cli/console_win32.cpp
index d3b1614..813daa0 100644
--- a/cli/console_win32.cpp
+++ b/cli/console_win32.cpp
@@ -23,7 +23,7 @@
  */
 #include <windows.h>
 #include <iostream>
-#include "console.h"
+#include "console.hpp"
 
 namespace eoskeygen {
 
diff --git a/cli/isatty.cpp b/cli/isatty.cpp
index e32fe19..5fdadfb 100644
--- a/cli/isatty.cpp
+++ b/cli/isatty.cpp
@@ -5,7 +5,7 @@
 #define _isatty isatty
 #define _fileno fileno
 #endif
-#include "isatty.h"
+#include "isatty.hpp"
 
 namespace eoskeygen {
 
diff --git a/cli/isatty.h b/cli/isatty.hpp
similarity index 100%
rename from cli/isatty.h
rename to cli/isatty.hpp
diff --git a/cli/main.cpp b/cli/main.cpp
index eb74b8b..ff3c527 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -32,10 +32,10 @@
 #include <eoskeygen/core/dictionary.h>
 #include <eoskeygen/core/leet.h>
 #include <eoskeygen/key_search.h>
-#include "cli_key_search_result.h"
-#include "console.h"
-#include "benchmark.h"
-#include "config.h"
+#include "cli_key_search_result.hpp"
+#include "console.hpp"
+#include "benchmark.hpp"
+#include "config.hpp"
 
 // Command line options.
 bool option_l33t = false;
diff --git a/config.h.in b/config.hpp.in
similarity index 100%
rename from config.h.in
rename to config.hpp.in