diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 414ea0e..e4f42a4 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -25,7 +25,7 @@
 #include <QGridLayout>
 #include <QStackedWidget>
 #include "GenerateWindow.hpp"
-#include "SearchWindow.h"
+#include "SearchWindow.hpp"
 #include "MainWindow.hpp"
 
 MainWindow::MainWindow(QWidget *parent) :
diff --git a/gui/MultiSelect.cpp b/gui/MultiSelect.cpp
index 98c6dac..bccf803 100644
--- a/gui/MultiSelect.cpp
+++ b/gui/MultiSelect.cpp
@@ -26,7 +26,7 @@
 #include <QMouseEvent>
 #include <QListWidget>
 #include <QListWidgetItem>
-#include "MultiSelect.h"
+#include "MultiSelect.hpp"
 
 MultiSelect::MultiSelect(const QString& text, bool user_can_add, QWidget *parent) :
 QPushButton		(text + ": none", parent)
diff --git a/gui/MultiSelect.h b/gui/MultiSelect.hpp
similarity index 100%
rename from gui/MultiSelect.h
rename to gui/MultiSelect.hpp
diff --git a/gui/SearchWindow.cpp b/gui/SearchWindow.cpp
index cbfa290..3b962d5 100644
--- a/gui/SearchWindow.cpp
+++ b/gui/SearchWindow.cpp
@@ -32,8 +32,8 @@
 #include <eoskeygen/core/leet.h>
 #include <eoskeygen/core/string.h>
 #include "config.h"
-#include "helpers.h"
-#include "SearchWindow.h"
+#include "helpers.hpp"
+#include "SearchWindow.hpp"
 
 SearchWindow::SearchWindow(QWidget *parent, Qt::WindowFlags flags) :
 QWidget			(parent, flags),
diff --git a/gui/SearchWindow.h b/gui/SearchWindow.hpp
similarity index 99%
rename from gui/SearchWindow.h
rename to gui/SearchWindow.hpp
index c57f17f..49bc41b 100644
--- a/gui/SearchWindow.h
+++ b/gui/SearchWindow.hpp
@@ -35,7 +35,7 @@
 #include <QWidget>
 #include <eoskeygen/key_search_result.h>
 #include <eoskeygen/key_search.h>
-#include "MultiSelect.h"
+#include "MultiSelect.hpp"
 
 class SearchWindow : public QWidget, public eoskeygen::IKeySearchResult
 {
diff --git a/gui/helpers.cpp b/gui/helpers.cpp
index 3b492b4..d1574d4 100644
--- a/gui/helpers.cpp
+++ b/gui/helpers.cpp
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "helpers.h"
+#include "helpers.hpp"
 
 QStringList get_files(const QDir& directory) {
 
diff --git a/gui/helpers.h b/gui/helpers.hpp
similarity index 100%
rename from gui/helpers.h
rename to gui/helpers.hpp