diff --git a/cli/cli_key_search_result.cpp b/cli/cli_key_search_result.cpp
index 24cf8c3..7ec6b18 100644
--- a/cli/cli_key_search_result.cpp
+++ b/cli/cli_key_search_result.cpp
@@ -23,7 +23,7 @@
  */
 #include <iostream>
 #include <libeosio/WIF.hpp>
-#include <eoskeygen/core/dictionary.h>
+#include <eoskeygen/core/dictionary.hpp>
 #include "console.hpp"
 #include "cli_key_search_result.hpp"
 
diff --git a/cli/cli_key_search_result.hpp b/cli/cli_key_search_result.hpp
index dcb749c..c9a2e15 100644
--- a/cli/cli_key_search_result.hpp
+++ b/cli/cli_key_search_result.hpp
@@ -25,9 +25,9 @@
 #define EOSIOKEYGEN_KEY_SEARCH_HELPERS_H
 
 #include <libeosio/types.hpp>
-#include <eoskeygen/core/string.h>
-#include <eoskeygen/key_search.h>
-#include <eoskeygen/key_search_result.h>
+#include <eoskeygen/core/string.hpp>
+#include <eoskeygen/key_search.hpp>
+#include <eoskeygen/key_search_result.hpp>
 
 namespace eoskeygen {
 
diff --git a/cli/main.cpp b/cli/main.cpp
index a68a894..aa34553 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -26,12 +26,12 @@
 #include <libeosio/base58.hpp>
 #include <libeosio/ec.hpp>
 #include <libeosio/WIF.hpp>
-#include <eoskeygen/config.h>
-#include <eoskeygen/core/file.h>
-#include <eoskeygen/core/string.h>
-#include <eoskeygen/core/dictionary.h>
-#include <eoskeygen/core/leet.h>
-#include <eoskeygen/key_search.h>
+#include <eoskeygen/config.hpp>
+#include <eoskeygen/core/file.hpp>
+#include <eoskeygen/core/string.hpp>
+#include <eoskeygen/core/dictionary.hpp>
+#include <eoskeygen/core/leet.hpp>
+#include <eoskeygen/key_search.hpp>
 #include "cli_key_search_result.hpp"
 #include "console.hpp"
 #include "benchmark.hpp"
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index fa9e2d5..e268a16 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -34,7 +34,7 @@ if (USE_THREADS)
 endif (USE_THREADS)
 
 # Project config file
-configure_file(src/config.h.in "${CMAKE_CURRENT_LIST_DIR}/include/eoskeygen/config.h" @ONLY)
+configure_file(config.hpp.in "${CMAKE_CURRENT_LIST_DIR}/include/eoskeygen/config.hpp" @ONLY)
 
 add_library( ${COMMON_NAME} STATIC ${COMMON_SOURCE} )
 
diff --git a/common/src/config.h.in b/common/config.hpp.in
similarity index 100%
rename from common/src/config.h.in
rename to common/config.hpp.in
diff --git a/common/include/eoskeygen/config.hpp b/common/include/eoskeygen/config.hpp
new file mode 100644
index 0000000..5728f1f
--- /dev/null
+++ b/common/include/eoskeygen/config.hpp
@@ -0,0 +1,30 @@
+/**
+ * MIT License
+ *
+ * Copyright (c) 2019-2020 EOS Sw/eden
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef EOSIOKEYGEN_COMMON_CONFIG_H
+#define EOSIOKEYGEN_COMMON_CONFIG_H
+
+// Defined if we have thread support.
+#define EOSIOKEYGEN_HAVE_THREADS
+
+#endif /* EOSIOKEYGEN_COMMON_CONFIG_H */
diff --git a/common/include/eoskeygen/core/dictionary.h b/common/include/eoskeygen/core/dictionary.hpp
similarity index 100%
rename from common/include/eoskeygen/core/dictionary.h
rename to common/include/eoskeygen/core/dictionary.hpp
diff --git a/common/include/eoskeygen/core/file.h b/common/include/eoskeygen/core/file.hpp
similarity index 97%
rename from common/include/eoskeygen/core/file.h
rename to common/include/eoskeygen/core/file.hpp
index fffebaa..6f5c7e3 100644
--- a/common/include/eoskeygen/core/file.h
+++ b/common/include/eoskeygen/core/file.hpp
@@ -24,7 +24,7 @@
 #ifndef EOSIOKEYGEN_COMMON_CORE_FILE_H
 #define EOSIOKEYGEN_COMMON_CORE_FILE_H
 
-#include <eoskeygen/core/strlist.h>
+#include <eoskeygen/core/strlist.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/include/eoskeygen/core/leet.h b/common/include/eoskeygen/core/leet.hpp
similarity index 97%
rename from common/include/eoskeygen/core/leet.h
rename to common/include/eoskeygen/core/leet.hpp
index 01289fc..7631052 100644
--- a/common/include/eoskeygen/core/leet.h
+++ b/common/include/eoskeygen/core/leet.hpp
@@ -25,7 +25,7 @@
 #define EOSIOKEYGEN_COMMON_CORE_LEET_H
 
 #include <string>
-#include <eoskeygen/core/strlist.h>
+#include <eoskeygen/core/strlist.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/include/eoskeygen/core/string.h b/common/include/eoskeygen/core/string.hpp
similarity index 100%
rename from common/include/eoskeygen/core/string.h
rename to common/include/eoskeygen/core/string.hpp
diff --git a/common/include/eoskeygen/core/strlist.h b/common/include/eoskeygen/core/strlist.hpp
similarity index 100%
rename from common/include/eoskeygen/core/strlist.h
rename to common/include/eoskeygen/core/strlist.hpp
diff --git a/common/include/eoskeygen/key_search.h b/common/include/eoskeygen/key_search.hpp
similarity index 96%
rename from common/include/eoskeygen/key_search.h
rename to common/include/eoskeygen/key_search.hpp
index 94bbd79..f757002 100644
--- a/common/include/eoskeygen/key_search.h
+++ b/common/include/eoskeygen/key_search.hpp
@@ -27,9 +27,9 @@
 #include <stdint.h>
 #include <string>
 #include <libeosio/types.hpp>
-#include <eoskeygen/config.h>
-#include <eoskeygen/core/dictionary.h>
-#include <eoskeygen/core/strlist.h>
+#include <eoskeygen/config.hpp>
+#include <eoskeygen/core/dictionary.hpp>
+#include <eoskeygen/core/strlist.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/include/eoskeygen/key_search_result.h b/common/include/eoskeygen/key_search_result.hpp
similarity index 97%
rename from common/include/eoskeygen/key_search_result.h
rename to common/include/eoskeygen/key_search_result.hpp
index 943e6d9..825ebae 100644
--- a/common/include/eoskeygen/key_search_result.h
+++ b/common/include/eoskeygen/key_search_result.hpp
@@ -24,7 +24,7 @@
 #ifndef EOSIOKEYGEN_COMMON_KEY_SEARCH_RESULT_H
 #define EOSIOKEYGEN_COMMON_KEY_SEARCH_RESULT_H
 
-#include <eoskeygen/key_search.h>
+#include <eoskeygen/key_search.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/src/core/dictionary.cpp b/common/src/core/dictionary.cpp
index 12c8e42..11bd50b 100644
--- a/common/src/core/dictionary.cpp
+++ b/common/src/core/dictionary.cpp
@@ -25,9 +25,9 @@
 #include <cstdio>
 #include <iterator>
 #include <algorithm>
-#include <eoskeygen/core/string.h>
-#include <eoskeygen/core/dictionary.h>
-#include <eoskeygen/core/file.h>
+#include <eoskeygen/core/string.hpp>
+#include <eoskeygen/core/dictionary.hpp>
+#include <eoskeygen/core/file.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/src/core/file.cpp b/common/src/core/file.cpp
index ac73356..74f4c5e 100644
--- a/common/src/core/file.cpp
+++ b/common/src/core/file.cpp
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 #include <cstdio>
-#include <eoskeygen/core/string.h>
-#include <eoskeygen/core/file.h>
+#include <eoskeygen/core/string.hpp>
+#include <eoskeygen/core/file.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/src/core/leet.cpp b/common/src/core/leet.cpp
index bf0e7f1..75bed31 100644
--- a/common/src/core/leet.cpp
+++ b/common/src/core/leet.cpp
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 #include <algorithm>
-#include <eoskeygen/core/leet.h>
+#include <eoskeygen/core/leet.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/src/core/string.cpp b/common/src/core/string.cpp
index 164e362..1851a01 100644
--- a/common/src/core/string.cpp
+++ b/common/src/core/string.cpp
@@ -24,7 +24,7 @@
 #include <cstddef>
 #include <cctype>
 #include <algorithm>
-#include <eoskeygen/core/string.h>
+#include <eoskeygen/core/string.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/src/core/strlist.cpp b/common/src/core/strlist.cpp
index ea12151..6212a35 100644
--- a/common/src/core/strlist.cpp
+++ b/common/src/core/strlist.cpp
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 #include <algorithm>
-#include <eoskeygen/core/string.h>
-#include <eoskeygen/core/strlist.h>
+#include <eoskeygen/core/string.hpp>
+#include <eoskeygen/core/strlist.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/src/key_search.cpp b/common/src/key_search.cpp
index d849d78..810f884 100644
--- a/common/src/key_search.cpp
+++ b/common/src/key_search.cpp
@@ -23,10 +23,10 @@
  */
 #include <libeosio/ec.hpp>
 #include <libeosio/WIF.hpp>
-#include <eoskeygen/config.h>
-#include <eoskeygen/core/string.h>
-#include <eoskeygen/key_search_result.h>
-#include <eoskeygen/key_search.h>
+#include <eoskeygen/config.hpp>
+#include <eoskeygen/core/string.hpp>
+#include <eoskeygen/key_search_result.hpp>
+#include <eoskeygen/key_search.hpp>
 
 namespace eoskeygen {
 
diff --git a/common/src/key_search_mt.cpp b/common/src/key_search_mt.cpp
index abd74c3..00e50e3 100644
--- a/common/src/key_search_mt.cpp
+++ b/common/src/key_search_mt.cpp
@@ -26,8 +26,8 @@
 #include <mutex>
 #include <vector>
 #include <libeosio/ec.hpp>
-#include <eoskeygen/key_search_result.h>
-#include <eoskeygen/key_search.h>
+#include <eoskeygen/key_search_result.hpp>
+#include <eoskeygen/key_search.hpp>
 
 namespace eoskeygen {
 
diff --git a/gui/SearchWindow.cpp b/gui/SearchWindow.cpp
index bdc77c4..3a71a5d 100644
--- a/gui/SearchWindow.cpp
+++ b/gui/SearchWindow.cpp
@@ -29,8 +29,8 @@
 #include <QFuture>
 #include <QtConcurrent>
 #include <libeosio/WIF.hpp>
-#include <eoskeygen/core/leet.h>
-#include <eoskeygen/core/string.h>
+#include <eoskeygen/core/leet.hpp>
+#include <eoskeygen/core/string.hpp>
 #include "config.hpp"
 #include "helpers.hpp"
 #include "SearchWindow.hpp"
diff --git a/gui/SearchWindow.hpp b/gui/SearchWindow.hpp
index 49bc41b..a918d0b 100644
--- a/gui/SearchWindow.hpp
+++ b/gui/SearchWindow.hpp
@@ -33,8 +33,8 @@
 #include <QGridLayout>
 #include <QFutureWatcher>
 #include <QWidget>
-#include <eoskeygen/key_search_result.h>
-#include <eoskeygen/key_search.h>
+#include <eoskeygen/key_search_result.hpp>
+#include <eoskeygen/key_search.hpp>
 #include "MultiSelect.hpp"
 
 class SearchWindow : public QWidget, public eoskeygen::IKeySearchResult