diff --git a/coquillo.pro b/coquillo.pro
index e3acdf4..bda6b72 100644
--- a/coquillo.pro
+++ b/coquillo.pro
@@ -27,47 +27,47 @@ FORMS += \
     ui/tagsearchdialog.ui \
 
 HEADERS += \
-    src/actionsignalmapper.h \
-    src/mainwindow.h \
-    src/stringstoremodel.h \
-    src/filebrowser/directorymodel.h \
-    src/filebrowser/filebrowser.h \
-    src/filters/abstractfilter.h \
-    src/filters/parsediscnumber.h \
-    src/filters/safefilenames.h \
-    src/filters/scaleimages.h \
-    src/filters/trimwhitespace.h \
-    src/metadata/filereader.h \
-    src/metadata/filewriter.h \
-    src/metadata/image.h \
-    src/metadata/imagecache.h \
-    src/metadata/imagetypes.h \
-    src/metadata/mapper.h \
-    src/metadata/mediacrawler.h \
-    src/metadata/metadata.h \
-    src/metadata/metadatamodel.h \
-    src/metadata/tags/default.h \
-    src/metadata/tags/id3v2.h \
-    src/metadata/tags/xiphcomment.h \
-    src/processor/basewidget.h \
-    src/processor/parserwidget.h \
-    src/processor/patternwidget.h \
-    src/processor/patterns.h \
-    src/processor/renamewidget.h \
-    src/searcher/abstractsearcher.h \
-    src/searcher/musicbrainz.h \
-    src/settings/settingsdialog.h \
-    src/tageditor/basictags.h \
-    src/tageditor/imagemodel.h \
-    src/tageditor/imagetags.h \
-    src/tageditor/metadatachangeindicatordelegate.h \
-    src/tageditor/rawdata.h \
-    src/tageditor/tageditor.h \
-    src/webtags/filterproxymodel.h \
-    src/webtags/tagsearchdialog.h \
-    src/webtags/trackselectionmodel.h \
+    src/actionsignalmapper.hpp \
+    src/mainwindow.hpp \
+    src/stringstoremodel.hpp \
+    src/filebrowser/directorymodel.hpp \
+    src/filebrowser/filebrowser.hpp \
+    src/filters/abstractfilter.hpp \
+    src/filters/parsediscnumber.hpp \
+    src/filters/safefilenames.hpp \
+    src/filters/scaleimages.hpp \
+    src/filters/trimwhitespace.hpp \
+    src/metadata/filereader.hpp \
+    src/metadata/filewriter.hpp \
+    src/metadata/image.hpp \
+    src/metadata/imagecache.hpp \
+    src/metadata/imagetypes.hpp \
+    src/metadata/mapper.hpp \
+    src/metadata/mediacrawler.hpp \
+    src/metadata/metadata.hpp \
+    src/metadata/metadatamodel.hpp \
+    src/metadata/tags/default.hpp \
+    src/metadata/tags/id3v2.hpp \
+    src/metadata/tags/xiphcomment.hpp \
+    src/processor/basewidget.hpp \
+    src/processor/parserwidget.hpp \
+    src/processor/patternwidget.hpp \
+    src/processor/patterns.hpp \
+    src/processor/renamewidget.hpp \
+    src/searcher/abstractsearcher.hpp \
+    src/searcher/musicbrainz.hpp \
+    src/settings/settingsdialog.hpp \
+    src/tageditor/basictags.hpp \
+    src/tageditor/imagemodel.hpp \
+    src/tageditor/imagetags.hpp \
+    src/tageditor/metadatachangeindicatordelegate.hpp \
+    src/tageditor/rawdata.hpp \
+    src/tageditor/tageditor.hpp \
+    src/webtags/filterproxymodel.hpp \
+    src/webtags/tagsearchdialog.hpp \
+    src/webtags/trackselectionmodel.hpp \
     # Experimental
-    src/quick/metadataproxymodel.h \
+    src/quick/metadataproxymodel.hpp \
 
 SOURCES += \
     src/main.cpp \
diff --git a/src/actionsignalmapper.cpp b/src/actionsignalmapper.cpp
index 110274a..c221303 100644
--- a/src/actionsignalmapper.cpp
+++ b/src/actionsignalmapper.cpp
@@ -1,6 +1,6 @@
 
 #include <QAction>
-#include "actionsignalmapper.h"
+#include "actionsignalmapper.hpp"
 
 namespace Coquillo {
     void ActionSignalMapper::map(QAction * action) {
diff --git a/src/actionsignalmapper.h b/src/actionsignalmapper.hpp
similarity index 100%
rename from src/actionsignalmapper.h
rename to src/actionsignalmapper.hpp
diff --git a/src/filebrowser/directorymodel.cpp b/src/filebrowser/directorymodel.cpp
index c76ebdc..3716135 100644
--- a/src/filebrowser/directorymodel.cpp
+++ b/src/filebrowser/directorymodel.cpp
@@ -1,7 +1,7 @@
 
 #include <QDebug>
 #include <QFileSystemModel>
-#include "directorymodel.h"
+#include "directorymodel.hpp"
 
 namespace Coquillo {
     DirectoryModel::DirectoryModel(QObject * parent)
diff --git a/src/filebrowser/directorymodel.h b/src/filebrowser/directorymodel.hpp
similarity index 100%
rename from src/filebrowser/directorymodel.h
rename to src/filebrowser/directorymodel.hpp
diff --git a/src/filebrowser/filebrowser.cpp b/src/filebrowser/filebrowser.cpp
index f850108..8fc5be8 100644
--- a/src/filebrowser/filebrowser.cpp
+++ b/src/filebrowser/filebrowser.cpp
@@ -9,8 +9,8 @@
 #include <QMouseEvent>
 #include <QSortFilterProxyModel>
 
-#include "directorymodel.h"
-#include "filebrowser.h"
+#include "directorymodel.hpp"
+#include "filebrowser.hpp"
 #include "ui_filebrowser.h"
 
 namespace Coquillo {
diff --git a/src/filebrowser/filebrowser.h b/src/filebrowser/filebrowser.hpp
similarity index 100%
rename from src/filebrowser/filebrowser.h
rename to src/filebrowser/filebrowser.hpp
diff --git a/src/filebrowser/filebrowsermanager.cpp b/src/filebrowser/filebrowsermanager.cpp
index 5600de0..c078a4e 100644
--- a/src/filebrowser/filebrowsermanager.cpp
+++ b/src/filebrowser/filebrowsermanager.cpp
@@ -1,4 +1,4 @@
-#include "filebrowsermanager.h"
+#include "filebrowsermanager.hpp"
 
 namespace Coquillo {
     FileBrowserManager::FileBrowserManager(QObject * parent)
diff --git a/src/filebrowser/filebrowsermanager.h b/src/filebrowser/filebrowsermanager.hpp
similarity index 100%
rename from src/filebrowser/filebrowsermanager.h
rename to src/filebrowser/filebrowsermanager.hpp
diff --git a/src/filters/abstractfilter.h b/src/filters/abstractfilter.hpp
similarity index 100%
rename from src/filters/abstractfilter.h
rename to src/filters/abstractfilter.hpp
diff --git a/src/filters/parsediscnumber.cpp b/src/filters/parsediscnumber.cpp
index ec0a47d..c056810 100644
--- a/src/filters/parsediscnumber.cpp
+++ b/src/filters/parsediscnumber.cpp
@@ -1,6 +1,6 @@
 
-#include "metadata/metadata.h"
-#include "parsediscnumber.h"
+#include "metadata/metadata.hpp"
+#include "parsediscnumber.hpp"
 
 namespace Coquillo {
     namespace Filter {
diff --git a/src/filters/parsediscnumber.h b/src/filters/parsediscnumber.hpp
similarity index 91%
rename from src/filters/parsediscnumber.h
rename to src/filters/parsediscnumber.hpp
index 603e8f6..13e77a2 100644
--- a/src/filters/parsediscnumber.h
+++ b/src/filters/parsediscnumber.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_FILTER_PARSEDISCNUMBER_H
 #define COQUILLO_FILTER_PARSEDISCNUMBER_H
 
-#include "abstractfilter.h"
+#include "abstractfilter.hpp"
 
 namespace Coquillo {
     namespace Filter {
diff --git a/src/filters/safefilenames.cpp b/src/filters/safefilenames.cpp
index fa28a08..0046001 100644
--- a/src/filters/safefilenames.cpp
+++ b/src/filters/safefilenames.cpp
@@ -1,6 +1,6 @@
 
-#include "metadata/metadata.h"
-#include "safefilenames.h"
+#include "metadata/metadata.hpp"
+#include "safefilenames.hpp"
 
 namespace Coquillo {
     namespace Filter {
diff --git a/src/filters/safefilenames.h b/src/filters/safefilenames.hpp
similarity index 100%
rename from src/filters/safefilenames.h
rename to src/filters/safefilenames.hpp
diff --git a/src/filters/scaleimages.cpp b/src/filters/scaleimages.cpp
index b8c2434..3be9698 100644
--- a/src/filters/scaleimages.cpp
+++ b/src/filters/scaleimages.cpp
@@ -1,7 +1,7 @@
 
-#include "metadata/imagecache.h"
-#include "metadata/metadata.h"
-#include "scaleimages.h"
+#include "metadata/imagecache.hpp"
+#include "metadata/metadata.hpp"
+#include "scaleimages.hpp"
 
 namespace Coquillo {
     namespace Filter {
diff --git a/src/filters/scaleimages.h b/src/filters/scaleimages.hpp
similarity index 92%
rename from src/filters/scaleimages.h
rename to src/filters/scaleimages.hpp
index 144f870..2903736 100644
--- a/src/filters/scaleimages.h
+++ b/src/filters/scaleimages.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_FILTER_SCALEIMAGES_H
 #define COQUILLO_FILTER_SCALEIMAGES_H
 
-#include "abstractfilter.h"
+#include "abstractfilter.hpp"
 
 namespace Coquillo {
     namespace Filter {
diff --git a/src/filters/trimwhitespace.cpp b/src/filters/trimwhitespace.cpp
index bd3b788..b99b58d 100644
--- a/src/filters/trimwhitespace.cpp
+++ b/src/filters/trimwhitespace.cpp
@@ -1,6 +1,6 @@
 
-#include "metadata/metadata.h"
-#include "trimwhitespace.h"
+#include "metadata/metadata.hpp"
+#include "trimwhitespace.hpp"
 
 namespace Coquillo {
     namespace Filter {
diff --git a/src/filters/trimwhitespace.h b/src/filters/trimwhitespace.hpp
similarity index 91%
rename from src/filters/trimwhitespace.h
rename to src/filters/trimwhitespace.hpp
index 7b7302b..8afe956 100644
--- a/src/filters/trimwhitespace.h
+++ b/src/filters/trimwhitespace.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_FILTER_TRIMWHITESPACE_H
 #define COQUILLO_FILTER_TRIMWHITESPACE_H
 
-#include "abstractfilter.h"
+#include "abstractfilter.hpp"
 
 namespace Coquillo {
     namespace Filter {
diff --git a/src/main.cpp b/src/main.cpp
index 7ae73c6..be5349f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
 #include <QMap>
 #include <QSettings>
 #include <QStandardPaths>
-#include "mainwindow.h"
+#include "mainwindow.hpp"
 
 void prepare_settings() {
     QSettings settings;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 721aaea..69d20f1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -9,17 +9,17 @@
 #include <QSortFilterProxyModel>
 #include <QTimer>
 
-#include "actionsignalmapper.h"
-#include "stringstoremodel.h"
-#include "mainwindow.h"
+#include "actionsignalmapper.hpp"
+#include "stringstoremodel.hpp"
+#include "mainwindow.hpp"
 #include "ui_mainwindow.h"
 
-#include "filebrowser/filebrowser.h"
-#include "metadata/metadatamodel.h"
-#include "processor/renamewidget.h"
-#include "processor/parserwidget.h"
-#include "settings/settingsdialog.h"
-#include "webtags/tagsearchdialog.h"
+#include "filebrowser/filebrowser.hpp"
+#include "metadata/metadatamodel.hpp"
+#include "processor/renamewidget.hpp"
+#include "processor/parserwidget.hpp"
+#include "settings/settingsdialog.hpp"
+#include "webtags/tagsearchdialog.hpp"
 
 namespace Coquillo {
     MainWindow::MainWindow(QWidget * parent)
diff --git a/src/mainwindow.h b/src/mainwindow.hpp
similarity index 100%
rename from src/mainwindow.h
rename to src/mainwindow.hpp
diff --git a/src/metadata/filereader.cpp b/src/metadata/filereader.cpp
index cf1cb96..4bab5cd 100644
--- a/src/metadata/filereader.cpp
+++ b/src/metadata/filereader.cpp
@@ -10,11 +10,11 @@
 #include <taglib/tfile.h>
 #include <taglib/vorbisfile.h>
 
-#include "filereader.h"
-#include "metadata.h"
-#include "tags/default.h"
-#include "tags/id3v2.h"
-#include "tags/xiphcomment.h"
+#include "filereader.hpp"
+#include "metadata.hpp"
+#include "tags/default.hpp"
+#include "tags/id3v2.hpp"
+#include "tags/xiphcomment.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/filereader.h b/src/metadata/filereader.hpp
similarity index 100%
rename from src/metadata/filereader.h
rename to src/metadata/filereader.hpp
diff --git a/src/metadata/filewriter.cpp b/src/metadata/filewriter.cpp
index dfd46cd..272a99a 100644
--- a/src/metadata/filewriter.cpp
+++ b/src/metadata/filewriter.cpp
@@ -6,10 +6,10 @@
 #include <taglib/tfile.h>
 #include <taglib/vorbisfile.h>
 
-#include "filewriter.h"
-#include "tags/default.h"
-#include "tags/id3v2.h"
-#include "tags/xiphcomment.h"
+#include "filewriter.hpp"
+#include "tags/default.hpp"
+#include "tags/id3v2.hpp"
+#include "tags/xiphcomment.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/filewriter.h b/src/metadata/filewriter.hpp
similarity index 96%
rename from src/metadata/filewriter.h
rename to src/metadata/filewriter.hpp
index 914b27e..ce65ff1 100644
--- a/src/metadata/filewriter.h
+++ b/src/metadata/filewriter.hpp
@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <QRunnable>
-#include "metadata.h"
+#include "metadata.hpp"
 
 namespace TagLib {
     class File;
diff --git a/src/metadata/image.cpp b/src/metadata/image.cpp
index 32f4941..b3c7d20 100644
--- a/src/metadata/image.cpp
+++ b/src/metadata/image.cpp
@@ -1,6 +1,6 @@
 
-#include "image.h"
-#include "imagecache.h"
+#include "image.hpp"
+#include "imagecache.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/image.h b/src/metadata/image.hpp
similarity index 100%
rename from src/metadata/image.h
rename to src/metadata/image.hpp
diff --git a/src/metadata/imagecache.cpp b/src/metadata/imagecache.cpp
index 792c2b8..e368c4c 100644
--- a/src/metadata/imagecache.cpp
+++ b/src/metadata/imagecache.cpp
@@ -1,6 +1,6 @@
 
 #include <QDebug>
-#include "imagecache.h"
+#include "imagecache.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/imagecache.h b/src/metadata/imagecache.hpp
similarity index 100%
rename from src/metadata/imagecache.h
rename to src/metadata/imagecache.hpp
diff --git a/src/metadata/imagetypes.cpp b/src/metadata/imagetypes.cpp
index 6e98160..ad036dc 100644
--- a/src/metadata/imagetypes.cpp
+++ b/src/metadata/imagetypes.cpp
@@ -1,7 +1,7 @@
 
 #include <QStringList>
 #include <taglib/flacpicture.h>
-#include "imagetypes.h"
+#include "imagetypes.hpp"
 
 #define tr(str) QObject::tr(str)
 
diff --git a/src/metadata/imagetypes.h b/src/metadata/imagetypes.hpp
similarity index 100%
rename from src/metadata/imagetypes.h
rename to src/metadata/imagetypes.hpp
diff --git a/src/metadata/mapper.cpp b/src/metadata/mapper.cpp
index 32a5eb3..7bc3514 100644
--- a/src/metadata/mapper.cpp
+++ b/src/metadata/mapper.cpp
@@ -1,6 +1,6 @@
 
-#include "metadata.h"
-#include "mapper.h"
+#include "metadata.hpp"
+#include "mapper.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/mapper.h b/src/metadata/mapper.hpp
similarity index 98%
rename from src/metadata/mapper.h
rename to src/metadata/mapper.hpp
index ec60302..bfe1f58 100644
--- a/src/metadata/mapper.h
+++ b/src/metadata/mapper.hpp
@@ -5,7 +5,7 @@
 #include <QString>
 #include <QVariant>
 
-#include "tag.h"
+#include "tag.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/mediacrawler.cpp b/src/metadata/mediacrawler.cpp
index ce29c5a..1f581a8 100644
--- a/src/metadata/mediacrawler.cpp
+++ b/src/metadata/mediacrawler.cpp
@@ -1,7 +1,7 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include "mediacrawler.h"
+#include "mediacrawler.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/mediacrawler.h b/src/metadata/mediacrawler.hpp
similarity index 100%
rename from src/metadata/mediacrawler.h
rename to src/metadata/mediacrawler.hpp
diff --git a/src/metadata/metadata.cpp b/src/metadata/metadata.cpp
index 40b0710..b34fba9 100644
--- a/src/metadata/metadata.cpp
+++ b/src/metadata/metadata.cpp
@@ -1,8 +1,8 @@
 
 #include <QDebug>
 
-#include "mapper.h"
-#include "metadata.h"
+#include "mapper.hpp"
+#include "metadata.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/metadata.h b/src/metadata/metadata.hpp
similarity index 98%
rename from src/metadata/metadata.h
rename to src/metadata/metadata.hpp
index 4f0ae94..a675604 100644
--- a/src/metadata/metadata.h
+++ b/src/metadata/metadata.hpp
@@ -5,8 +5,8 @@
 #include <QString>
 #include <QVariant>
 
-#include "image.h"
-#include "tag.h"
+#include "image.hpp"
+#include "tag.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/metadatamodel.cpp b/src/metadata/metadatamodel.cpp
index 62805d9..35f658a 100644
--- a/src/metadata/metadatamodel.cpp
+++ b/src/metadata/metadatamodel.cpp
@@ -8,11 +8,11 @@
 #include <QIcon>
 #include <QThreadPool>
 
-#include "mediacrawler.h"
-#include "metadata.h"
-#include "metadatamodel.h"
-#include "filereader.h"
-#include "filewriter.h"
+#include "mediacrawler.hpp"
+#include "metadata.hpp"
+#include "metadatamodel.hpp"
+#include "filereader.hpp"
+#include "filewriter.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/metadatamodel.h b/src/metadata/metadatamodel.hpp
similarity index 99%
rename from src/metadata/metadatamodel.h
rename to src/metadata/metadatamodel.hpp
index dfaf147..43cdff7 100644
--- a/src/metadata/metadatamodel.h
+++ b/src/metadata/metadatamodel.hpp
@@ -3,7 +3,7 @@
 
 #include <QAbstractItemModel>
 #include <QHash>
-#include "metadata.h"
+#include "metadata.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/tag.h b/src/metadata/tag.hpp
similarity index 100%
rename from src/metadata/tag.h
rename to src/metadata/tag.hpp
diff --git a/src/metadata/tags/default.cpp b/src/metadata/tags/default.cpp
index 1c4fbd3..9e7f0e4 100644
--- a/src/metadata/tags/default.cpp
+++ b/src/metadata/tags/default.cpp
@@ -1,7 +1,7 @@
 
 #include <taglib/tstring.h>
-#include "metadata/image.h"
-#include "default.h"
+#include "metadata/image.hpp"
+#include "default.hpp"
 
 #define Q2TString(str) TagLib::String((str).toUtf8().data(), TagLib::String::UTF8)
 #define T2QString(str) QString::fromUtf8((str).toCString(true))
diff --git a/src/metadata/tags/default.h b/src/metadata/tags/default.hpp
similarity index 95%
rename from src/metadata/tags/default.h
rename to src/metadata/tags/default.hpp
index 4942ba7..b8253c1 100644
--- a/src/metadata/tags/default.h
+++ b/src/metadata/tags/default.hpp
@@ -2,7 +2,7 @@
 #define COQUILLO_METADATA_TAG_ABSTRACTTAG_H
 
 #include <taglib/tag.h>
-#include "metadata/tag.h"
+#include "metadata/tag.hpp"
 
 namespace Coquillo {
     namespace MetaData {
diff --git a/src/metadata/tags/id3v2.cpp b/src/metadata/tags/id3v2.cpp
index 5be5c25..a5c7dfd 100644
--- a/src/metadata/tags/id3v2.cpp
+++ b/src/metadata/tags/id3v2.cpp
@@ -4,9 +4,9 @@
 #include <taglib/id3v2tag.h>
 #include <taglib/textidentificationframe.h>
 #include <taglib/urllinkframe.h>
-#include "metadata/image.h"
-#include "metadata/mapper.h"
-#include "id3v2.h"
+#include "metadata/image.hpp"
+#include "metadata/mapper.hpp"
+#include "id3v2.hpp"
 
 #define T2QString(str) QString::fromUtf8((str).toCString(true))
 
diff --git a/src/metadata/tags/id3v2.h b/src/metadata/tags/id3v2.hpp
similarity index 95%
rename from src/metadata/tags/id3v2.h
rename to src/metadata/tags/id3v2.hpp
index 648ffc2..fdcdbc6 100644
--- a/src/metadata/tags/id3v2.h
+++ b/src/metadata/tags/id3v2.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_METADATA_TAG_ID3V2_H
 #define COQUILLO_METADATA_TAG_ID3V2_H
 
-#include "default.h"
+#include "default.hpp"
 
 namespace TagLib {
     namespace ID3v2 {
diff --git a/src/metadata/tags/xiphcomment.cpp b/src/metadata/tags/xiphcomment.cpp
index 0a8206d..2915649 100644
--- a/src/metadata/tags/xiphcomment.cpp
+++ b/src/metadata/tags/xiphcomment.cpp
@@ -1,9 +1,9 @@
 
 #include <QDebug>
 #include <taglib/xiphcomment.h>
-#include "metadata/image.h"
-#include "metadata/mapper.h"
-#include "xiphcomment.h"
+#include "metadata/image.hpp"
+#include "metadata/mapper.hpp"
+#include "xiphcomment.hpp"
 
 #define Q2TString(str) TagLib::String((str).toUtf8().data(), TagLib::String::UTF8)
 #define T2QString(str) QString::fromUtf8((str).toCString(true))
diff --git a/src/metadata/tags/xiphcomment.h b/src/metadata/tags/xiphcomment.hpp
similarity index 96%
rename from src/metadata/tags/xiphcomment.h
rename to src/metadata/tags/xiphcomment.hpp
index 3bba7df..af5fb42 100644
--- a/src/metadata/tags/xiphcomment.h
+++ b/src/metadata/tags/xiphcomment.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_METADATA_TAG_XIPHCOMMENT_H
 #define COQUILLO_METADATA_TAG_XIPHCOMMENT_H
 
-#include "default.h"
+#include "default.hpp"
 
 namespace TagLib {
     namespace Ogg {
diff --git a/src/processor/basewidget.cpp b/src/processor/basewidget.cpp
index fbac598..2629bc9 100644
--- a/src/processor/basewidget.cpp
+++ b/src/processor/basewidget.cpp
@@ -3,7 +3,7 @@
 #include <QItemSelectionModel>
 #include <QDebug>
 
-#include "basewidget.h"
+#include "basewidget.hpp"
 
 namespace Coquillo {
     namespace Processor {
diff --git a/src/processor/basewidget.h b/src/processor/basewidget.hpp
similarity index 100%
rename from src/processor/basewidget.h
rename to src/processor/basewidget.hpp
diff --git a/src/processor/parserwidget.cpp b/src/processor/parserwidget.cpp
index 9bccbd2..35fb47f 100644
--- a/src/processor/parserwidget.cpp
+++ b/src/processor/parserwidget.cpp
@@ -2,9 +2,9 @@
 #include <QDebug>
 #include <QDir>
 
-#include <metadata/metadatamodel.h>
-#include "parserwidget.h"
-#include "patterns.h"
+#include "metadata/metadatamodel.hpp"
+#include "parserwidget.hpp"
+#include "patterns.hpp"
 #include "ui_parserwidget.h"
 
 namespace Coquillo {
diff --git a/src/processor/parserwidget.h b/src/processor/parserwidget.hpp
similarity index 95%
rename from src/processor/parserwidget.h
rename to src/processor/parserwidget.hpp
index c4f0e41..43edcce 100644
--- a/src/processor/parserwidget.h
+++ b/src/processor/parserwidget.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_PROCESSOR_PARSERWIDGET_H
 #define COQUILLO_PROCESSOR_PARSERWIDGET_H
 
-#include "patternwidget.h"
+#include "patternwidget.hpp"
 
 namespace Ui {
     class ParserWidget;
diff --git a/src/processor/patterns.cpp b/src/processor/patterns.cpp
index 37c373d..cfc2bbf 100644
--- a/src/processor/patterns.cpp
+++ b/src/processor/patterns.cpp
@@ -3,7 +3,7 @@
 #include <QRegularExpression>
 #include <QVariant>
 
-#include "patterns.h"
+#include "patterns.hpp"
 
 namespace Coquillo {
     namespace Processor {
diff --git a/src/processor/patterns.h b/src/processor/patterns.hpp
similarity index 100%
rename from src/processor/patterns.h
rename to src/processor/patterns.hpp
diff --git a/src/processor/patternwidget.cpp b/src/processor/patternwidget.cpp
index ea7b944..a694a85 100644
--- a/src/processor/patternwidget.cpp
+++ b/src/processor/patternwidget.cpp
@@ -5,7 +5,7 @@
 #include <QLabel>
 #include <QPushButton>
 
-#include "patternwidget.h"
+#include "patternwidget.hpp"
 
 namespace Coquillo {
     namespace Processor {
diff --git a/src/processor/patternwidget.h b/src/processor/patternwidget.hpp
similarity index 97%
rename from src/processor/patternwidget.h
rename to src/processor/patternwidget.hpp
index acb129b..f5dc60e 100644
--- a/src/processor/patternwidget.h
+++ b/src/processor/patternwidget.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_PROCESSOR_PATTERNWIDGET_H
 #define COQUILLO_PROCESSOR_PATTERNWIDGET_H
 
-#include "basewidget.h"
+#include "basewidget.hpp"
 
 namespace Ui {
     class PatternWidget;
diff --git a/src/processor/renamewidget.cpp b/src/processor/renamewidget.cpp
index 7e6d609..b261c2c 100644
--- a/src/processor/renamewidget.cpp
+++ b/src/processor/renamewidget.cpp
@@ -4,9 +4,9 @@
 #include <QItemSelectionModel>
 #include <QTimer>
 
-#include <metadata/metadatamodel.h>
-#include "patterns.h"
-#include "renamewidget.h"
+#include "metadata/metadatamodel.hpp"
+#include "patterns.hpp"
+#include "renamewidget.hpp"
 #include "ui_renamewidget.h"
 
 namespace Coquillo {
diff --git a/src/processor/renamewidget.h b/src/processor/renamewidget.hpp
similarity index 95%
rename from src/processor/renamewidget.h
rename to src/processor/renamewidget.hpp
index b204b26..6ee817f 100644
--- a/src/processor/renamewidget.h
+++ b/src/processor/renamewidget.hpp
@@ -1,7 +1,7 @@
 #ifndef COQUILLO_PROCESSOR_RENAMEWIDGET_H
 #define COQUILLO_PROCESSOR_RENAMEWIDGET_H
 
-#include "patternwidget.h"
+#include "patternwidget.hpp"
 
 namespace Ui {
     class RenameWidget;
diff --git a/src/quick/metadataproxymodel.cpp b/src/quick/metadataproxymodel.cpp
index bdf6224..4e1cbbb 100644
--- a/src/quick/metadataproxymodel.cpp
+++ b/src/quick/metadataproxymodel.cpp
@@ -1,7 +1,7 @@
 
 #include <QDebug>
 
-#include "metadataproxymodel.h"
+#include "metadataproxymodel.hpp"
 
 namespace Coquillo {
     namespace Quick {
diff --git a/src/quick/metadataproxymodel.h b/src/quick/metadataproxymodel.hpp
similarity index 100%
rename from src/quick/metadataproxymodel.h
rename to src/quick/metadataproxymodel.hpp
diff --git a/src/searcher/abstractsearcher.cpp b/src/searcher/abstractsearcher.cpp
index 6ca3630..624a15d 100644
--- a/src/searcher/abstractsearcher.cpp
+++ b/src/searcher/abstractsearcher.cpp
@@ -1,4 +1,4 @@
-#include "abstractsearcher.h"
+#include "abstractsearcher.hpp"
 
 namespace Coquillo {
     namespace Searcher {
diff --git a/src/searcher/abstractsearcher.h b/src/searcher/abstractsearcher.hpp
similarity index 100%
rename from src/searcher/abstractsearcher.h
rename to src/searcher/abstractsearcher.hpp
diff --git a/src/searcher/musicbrainz.cpp b/src/searcher/musicbrainz.cpp
index 2fca097..f2f1196 100644
--- a/src/searcher/musicbrainz.cpp
+++ b/src/searcher/musicbrainz.cpp
@@ -12,8 +12,8 @@
 #include <musicbrainz5/Recording.h>
 #include <musicbrainz5/Release.h>
 #include <musicbrainz5/Track.h>
-#include <metadata/metadata.h>
-#include "musicbrainz.h"
+#include "metadata/metadata.hpp"
+#include "musicbrainz.hpp"
 
 namespace Coquillo {
     namespace Searcher {
diff --git a/src/searcher/musicbrainz.h b/src/searcher/musicbrainz.hpp
similarity index 97%
rename from src/searcher/musicbrainz.h
rename to src/searcher/musicbrainz.hpp
index 2c27e16..7b108d3 100644
--- a/src/searcher/musicbrainz.h
+++ b/src/searcher/musicbrainz.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <musicbrainz5/NameCreditList.h>
 #include <musicbrainz5/ReleaseList.h>
-#include "abstractsearcher.h"
+#include "abstractsearcher.hpp"
 
 namespace MusicBrainz5 {
     class CQuery;
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index da3feb0..bc3d8a6 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -5,7 +5,7 @@
 #include <QSettings>
 
 #include "ui_settingsdialog.h"
-#include "settingsdialog.h"
+#include "settingsdialog.hpp"
 
 namespace Coquillo {
     namespace Settings {
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.hpp
similarity index 100%
rename from src/settings/settingsdialog.h
rename to src/settings/settingsdialog.hpp
diff --git a/src/stringstoremodel.cpp b/src/stringstoremodel.cpp
index da1182a..adff38d 100644
--- a/src/stringstoremodel.cpp
+++ b/src/stringstoremodel.cpp
@@ -2,7 +2,7 @@
 #include <QDebug>
 #include <QSettings>
 #include <QStandardItemModel>
-#include "stringstoremodel.h"
+#include "stringstoremodel.hpp"
 
 namespace Coquillo {
     StringStoreModel::StringStoreModel(QObject * parent)
diff --git a/src/stringstoremodel.h b/src/stringstoremodel.hpp
similarity index 100%
rename from src/stringstoremodel.h
rename to src/stringstoremodel.hpp
diff --git a/src/tageditor/basictags.cpp b/src/tageditor/basictags.cpp
index 09b79da..30156e6 100644
--- a/src/tageditor/basictags.cpp
+++ b/src/tageditor/basictags.cpp
@@ -3,8 +3,8 @@
 #include <QButtonGroup>
 #include <QDataWidgetMapper>
 #include <QDebug>
-#include "basictags.h"
-#include "metadatachangeindicatordelegate.h"
+#include "basictags.hpp"
+#include "metadatachangeindicatordelegate.hpp"
 #include "ui_basictags.h"
 
 namespace Coquillo {
diff --git a/src/tageditor/basictags.h b/src/tageditor/basictags.hpp
similarity index 100%
rename from src/tageditor/basictags.h
rename to src/tageditor/basictags.hpp
diff --git a/src/tageditor/imagemodel.cpp b/src/tageditor/imagemodel.cpp
index 84999c9..bf83a14 100644
--- a/src/tageditor/imagemodel.cpp
+++ b/src/tageditor/imagemodel.cpp
@@ -6,8 +6,8 @@
 #include <QNetworkRequest>
 #include <QUrl>
 
-#include "metadata/metadatamodel.h"
-#include "imagemodel.h"
+#include "metadata/metadatamodel.hpp"
+#include "imagemodel.hpp"
 
 namespace Coquillo {
     namespace TagEditor {
diff --git a/src/tageditor/imagemodel.h b/src/tageditor/imagemodel.hpp
similarity index 100%
rename from src/tageditor/imagemodel.h
rename to src/tageditor/imagemodel.hpp
diff --git a/src/tageditor/imagetags.cpp b/src/tageditor/imagetags.cpp
index 586a617..12cf140 100644
--- a/src/tageditor/imagetags.cpp
+++ b/src/tageditor/imagetags.cpp
@@ -2,10 +2,10 @@
 #include <QDebug>
 #include <QDataWidgetMapper>
 #include <QFileDialog>
-#include "metadata/imagetypes.h"
-#include "metadata/metadatamodel.h"
-#include "imagemodel.h"
-#include "imagetags.h"
+#include "metadata/imagetypes.hpp"
+#include "metadata/metadatamodel.hpp"
+#include "imagemodel.hpp"
+#include "imagetags.hpp"
 #include "ui_imagetags.h"
 
 namespace Coquillo {
diff --git a/src/tageditor/imagetags.h b/src/tageditor/imagetags.hpp
similarity index 100%
rename from src/tageditor/imagetags.h
rename to src/tageditor/imagetags.hpp
diff --git a/src/tageditor/metadatachangeindicatordelegate.cpp b/src/tageditor/metadatachangeindicatordelegate.cpp
index 48f0413..34009cf 100644
--- a/src/tageditor/metadatachangeindicatordelegate.cpp
+++ b/src/tageditor/metadatachangeindicatordelegate.cpp
@@ -1,7 +1,7 @@
 #include <QDebug>
 
-#include <metadata/metadatamodel.h>
-#include "metadatachangeindicatordelegate.h"
+#include "metadata/metadatamodel.hpp"
+#include "metadatachangeindicatordelegate.hpp"
 
 namespace Coquillo {
     MetaDataChangeIndicatorDelegate::MetaDataChangeIndicatorDelegate(QObject * parent)
diff --git a/src/tageditor/metadatachangeindicatordelegate.h b/src/tageditor/metadatachangeindicatordelegate.hpp
similarity index 100%
rename from src/tageditor/metadatachangeindicatordelegate.h
rename to src/tageditor/metadatachangeindicatordelegate.hpp
diff --git a/src/tageditor/rawdata.cpp b/src/tageditor/rawdata.cpp
index a1db3d1..65cb5e6 100644
--- a/src/tageditor/rawdata.cpp
+++ b/src/tageditor/rawdata.cpp
@@ -1,8 +1,8 @@
 
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
-#include "metadata/metadatamodel.h"
-#include "rawdata.h"
+#include "metadata/metadatamodel.hpp"
+#include "rawdata.hpp"
 #include "ui_rawdata.h"
 
 namespace Coquillo {
diff --git a/src/tageditor/rawdata.h b/src/tageditor/rawdata.hpp
similarity index 100%
rename from src/tageditor/rawdata.h
rename to src/tageditor/rawdata.hpp
diff --git a/src/tageditor/tageditor.cpp b/src/tageditor/tageditor.cpp
index cef254e..b834524 100644
--- a/src/tageditor/tageditor.cpp
+++ b/src/tageditor/tageditor.cpp
@@ -1,10 +1,10 @@
 
 #include <QDebug>
 
-#include "basictags.h"
-#include "imagetags.h"
-#include "rawdata.h"
-#include "tageditor.h"
+#include "basictags.hpp"
+#include "imagetags.hpp"
+#include "rawdata.hpp"
+#include "tageditor.hpp"
 
 namespace Coquillo {
     namespace TagEditor {
diff --git a/src/tageditor/tageditor.h b/src/tageditor/tageditor.hpp
similarity index 100%
rename from src/tageditor/tageditor.h
rename to src/tageditor/tageditor.hpp
diff --git a/src/webtags/filterproxymodel.cpp b/src/webtags/filterproxymodel.cpp
index 310f566..c25e4d4 100644
--- a/src/webtags/filterproxymodel.cpp
+++ b/src/webtags/filterproxymodel.cpp
@@ -1,8 +1,8 @@
 
 #include <QDebug>
 
-#include <metadata/metadatamodel.h>
-#include "filterproxymodel.h"
+#include "metadata/metadatamodel.hpp"
+#include "filterproxymodel.hpp"
 
 namespace Coquillo {
     namespace WebTags {
diff --git a/src/webtags/filterproxymodel.h b/src/webtags/filterproxymodel.hpp
similarity index 100%
rename from src/webtags/filterproxymodel.h
rename to src/webtags/filterproxymodel.hpp
diff --git a/src/webtags/tagsearchdialog.cpp b/src/webtags/tagsearchdialog.cpp
index 8e11974..4035ad7 100644
--- a/src/webtags/tagsearchdialog.cpp
+++ b/src/webtags/tagsearchdialog.cpp
@@ -2,10 +2,10 @@
 #include <QDebug>
 #include <QStandardItemModel>
 
-#include <metadata/metadatamodel.h>
-#include <searcher/musicbrainz.h>
-#include "trackselectionmodel.h"
-#include "tagsearchdialog.h"
+#include "metadata/metadatamodel.hpp"
+#include "searcher/musicbrainz.hpp"
+#include "trackselectionmodel.hpp"
+#include "tagsearchdialog.hpp"
 #include "ui_tagsearchdialog.h"
 
 namespace Coquillo {
diff --git a/src/webtags/tagsearchdialog.h b/src/webtags/tagsearchdialog.hpp
similarity index 100%
rename from src/webtags/tagsearchdialog.h
rename to src/webtags/tagsearchdialog.hpp
diff --git a/src/webtags/trackselectionmodel.cpp b/src/webtags/trackselectionmodel.cpp
index a41fe44..b9fc364 100644
--- a/src/webtags/trackselectionmodel.cpp
+++ b/src/webtags/trackselectionmodel.cpp
@@ -1,6 +1,6 @@
 
 #include <QDebug>
-#include "trackselectionmodel.h"
+#include "trackselectionmodel.hpp"
 
 namespace Coquillo {
     namespace WebTags {
diff --git a/src/webtags/trackselectionmodel.h b/src/webtags/trackselectionmodel.hpp
similarity index 100%
rename from src/webtags/trackselectionmodel.h
rename to src/webtags/trackselectionmodel.hpp
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 56850ff..701200e 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -306,7 +306,7 @@
   <customwidget>
    <class>Coquillo::TagEditor::TagEditor</class>
    <extends>QTabWidget</extends>
-   <header>tageditor/tageditor.h</header>
+   <header>tageditor/tageditor.hpp</header>
    <container>1</container>
   </customwidget>
  </customwidgets>