diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
index cb7b23c2..6c315c28 100644
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@@ -46,7 +46,7 @@ target_sources(
         ${RESOURCES}
         main.cpp
         mainwindow.cpp
-        mainwindow.h
+        mainwindow.hpp
 )
 target_link_libraries(
     ${TARGET}
diff --git a/demo/commands/CMakeLists.txt b/demo/commands/CMakeLists.txt
index 6e69c418..1394101d 100644
--- a/demo/commands/CMakeLists.txt
+++ b/demo/commands/CMakeLists.txt
@@ -1,7 +1,7 @@
 target_sources(
     ${TARGET}
     PRIVATE
-        commands.h
+        commands.hpp
         node_add_connector.cpp
-        node_add_connector.h
+        node_add_connector.hpp
 )
diff --git a/demo/commands/commands.h b/demo/commands/commands.hpp
similarity index 74%
rename from demo/commands/commands.h
rename to demo/commands/commands.hpp
index b1f46295..313203f1 100644
--- a/demo/commands/commands.h
+++ b/demo/commands/commands.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/commands/commands.h>
+#include "commands/commands.hpp"
 
 enum CommandType
 {
diff --git a/demo/commands/node_add_connector.cpp b/demo/commands/node_add_connector.cpp
index 03e2e160..be07efe9 100644
--- a/demo/commands/node_add_connector.cpp
+++ b/demo/commands/node_add_connector.cpp
@@ -1,8 +1,8 @@
-#include "commands.h"
-#include "node_add_connector.h"
+#include "commands.hpp"
+#include "node_add_connector.hpp"
 
-#include <qschematic/items/node.h>
-#include <qschematic/items/connector.h>
+#include <qschematic/items/node.hpp>
+#include <qschematic/items/connector.hpp>
 
 using namespace Commands;
 
diff --git a/demo/commands/node_add_connector.h b/demo/commands/node_add_connector.hpp
similarity index 94%
rename from demo/commands/node_add_connector.h
rename to demo/commands/node_add_connector.hpp
index 72735444..42ed75ea 100644
--- a/demo/commands/node_add_connector.h
+++ b/demo/commands/node_add_connector.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/commands/base.h>
+#include <qschematic/commands/base.hpp>
 #include <QPointer>
 
 #include <memory>
diff --git a/demo/common/CMakeLists.txt b/demo/common/CMakeLists.txt
index 17197c03..dd7e29cf 100644
--- a/demo/common/CMakeLists.txt
+++ b/demo/common/CMakeLists.txt
@@ -2,7 +2,7 @@ target_sources(
     ${TARGET}
     PRIVATE
         treeitem.cpp
-        treeitem.h
+        treeitem.hpp
         treemodel.cpp
-        treemodel.h
+        treemodel.hpp
 )
diff --git a/demo/common/treeitem.cpp b/demo/common/treeitem.cpp
index 8bc15c81..6ff1facd 100644
--- a/demo/common/treeitem.cpp
+++ b/demo/common/treeitem.cpp
@@ -1,4 +1,4 @@
-#include "treeitem.h"
+#include "treeitem.hpp"
 
 TreeItem::TreeItem(const QVector<QVariant>& data, TreeItem* parent) :
     _data(data),
diff --git a/demo/common/treeitem.h b/demo/common/treeitem.hpp
similarity index 100%
rename from demo/common/treeitem.h
rename to demo/common/treeitem.hpp
diff --git a/demo/common/treemodel.cpp b/demo/common/treemodel.cpp
index 666e364b..7e06b9ac 100644
--- a/demo/common/treemodel.cpp
+++ b/demo/common/treemodel.cpp
@@ -1,5 +1,5 @@
-#include "treemodel.h"
-#include "treeitem.h"
+#include "treemodel.hpp"
+#include "treeitem.hpp"
 
 TreeModel::TreeModel(QObject* parent) :
     QAbstractItemModel(parent),
diff --git a/demo/common/treemodel.h b/demo/common/treemodel.hpp
similarity index 100%
rename from demo/common/treemodel.h
rename to demo/common/treemodel.hpp
diff --git a/demo/items/CMakeLists.txt b/demo/items/CMakeLists.txt
index 147248c3..7a67b050 100644
--- a/demo/items/CMakeLists.txt
+++ b/demo/items/CMakeLists.txt
@@ -4,18 +4,18 @@ target_sources(
     ${TARGET}
     PRIVATE
         customitemfactory.cpp
-        customitemfactory.h
+        customitemfactory.hpp
         fancywire.cpp
-        fancywire.h
+        fancywire.hpp
         flowend.cpp
-        flowend.h
+        flowend.hpp
         flowstart.cpp
-        flowstart.h
-        itemtypes.h
+        flowstart.hpp
+        itemtypes.hpp
         operation.cpp
-        operation.h
+        operation.hpp
         operationconnector.cpp
-        operationconnector.h
+        operationconnector.hpp
         operationdemo1.cpp
-        operationdemo1.h
+        operationdemo1.hpp
 )
diff --git a/demo/items/customitemfactory.cpp b/demo/items/customitemfactory.cpp
index 70fef558..1bc614a2 100644
--- a/demo/items/customitemfactory.cpp
+++ b/demo/items/customitemfactory.cpp
@@ -1,13 +1,13 @@
-#include "itemtypes.h"
-#include "operation.h"
-#include "operationconnector.h"
-#include "operationdemo1.h"
-#include "customitemfactory.h"
-#include "fancywire.h"
-#include "flowstart.h"
-#include "flowend.h"
-
-#include <qschematic/items/itemfactory.h>
+#include "itemtypes.hpp"
+#include "operation.hpp"
+#include "operationconnector.hpp"
+#include "operationdemo1.hpp"
+#include "customitemfactory.hpp"
+#include "fancywire.hpp"
+#include "flowstart.hpp"
+#include "flowend.hpp"
+
+#include <qschematic/items/itemfactory.hpp>
 
 std::shared_ptr<QSchematic::Items::Item> CustomItemFactory::from_container(const gpds::container& container)
 {
diff --git a/demo/items/customitemfactory.h b/demo/items/customitemfactory.hpp
similarity index 92%
rename from demo/items/customitemfactory.h
rename to demo/items/customitemfactory.hpp
index b71e3eb0..55744f8b 100644
--- a/demo/items/customitemfactory.h
+++ b/demo/items/customitemfactory.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/items/item.h>
+#include <qschematic/items/item.hpp>
 
 #include <functional>
 #include <memory>
diff --git a/demo/items/fancywire.cpp b/demo/items/fancywire.cpp
index c5c83c8e..e9c995d5 100644
--- a/demo/items/fancywire.cpp
+++ b/demo/items/fancywire.cpp
@@ -1,10 +1,10 @@
-#include "itemtypes.h"
-#include "fancywire.h"
+#include "itemtypes.hpp"
+#include "fancywire.hpp"
 
-#include <qschematic/commands/wirenet_rename.h>
-#include <qschematic/wire_system/point.h>
-#include <qschematic/items/connector.h>
-#include <qschematic/scene.h>
+#include <qschematic/commands/wirenet_rename.hpp>
+#include <qschematic/wire_system/point.hpp>
+#include <qschematic/items/connector.hpp>
+#include <qschematic/scene.hpp>
 
 #include <QPen>
 #include <QPainter>
diff --git a/demo/items/fancywire.h b/demo/items/fancywire.hpp
similarity index 92%
rename from demo/items/fancywire.h
rename to demo/items/fancywire.hpp
index 3b718a34..f814a6aa 100644
--- a/demo/items/fancywire.h
+++ b/demo/items/fancywire.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/items/wireroundedcorners.h>
+#include <qschematic/items/wireroundedcorners.hpp>
 
 class FancyWire : public QSchematic::Items::WireRoundedCorners
 {
diff --git a/demo/items/flowend.cpp b/demo/items/flowend.cpp
index b140e7c3..3881c9b8 100644
--- a/demo/items/flowend.cpp
+++ b/demo/items/flowend.cpp
@@ -1,8 +1,8 @@
-#include "flowend.h"
-#include "itemtypes.h"
-#include "operationconnector.h"
+#include "flowend.hpp"
+#include "itemtypes.hpp"
+#include "operationconnector.hpp"
 
-#include <qschematic/items/label.h>
+#include <qschematic/items/label.hpp>
 
 #include <QPainter>
 #include <QGraphicsDropShadowEffect>
diff --git a/demo/items/flowend.h b/demo/items/flowend.hpp
similarity index 96%
rename from demo/items/flowend.h
rename to demo/items/flowend.hpp
index d9d9c4f7..0e2b94a8 100644
--- a/demo/items/flowend.h
+++ b/demo/items/flowend.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "operation.h"
+#include "operation.hpp"
 
 class OperationConnector;
 
diff --git a/demo/items/flowstart.cpp b/demo/items/flowstart.cpp
index 5743c156..675098af 100644
--- a/demo/items/flowstart.cpp
+++ b/demo/items/flowstart.cpp
@@ -1,8 +1,8 @@
-#include "flowstart.h"
-#include "itemtypes.h"
-#include "operationconnector.h"
+#include "flowstart.hpp"
+#include "itemtypes.hpp"
+#include "operationconnector.hpp"
 
-#include <qschematic/items/label.h>
+#include <qschematic/items/label.hpp>
 
 #include <QPainter>
 #include <QGraphicsDropShadowEffect>
diff --git a/demo/items/flowstart.h b/demo/items/flowstart.hpp
similarity index 95%
rename from demo/items/flowstart.h
rename to demo/items/flowstart.hpp
index 8f7a98a7..e7bdf5ac 100644
--- a/demo/items/flowstart.h
+++ b/demo/items/flowstart.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "operation.h"
+#include "operation.hpp"
 
 class FlowStart :
     public Operation
diff --git a/demo/items/itemtypes.h b/demo/items/itemtypes.hpp
similarity index 85%
rename from demo/items/itemtypes.h
rename to demo/items/itemtypes.hpp
index 55f9713e..732d73d5 100644
--- a/demo/items/itemtypes.h
+++ b/demo/items/itemtypes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/items/item.h>
+#include <qschematic/items/item.hpp>
 
 enum ItemType {
     OperationType = QSchematic::Items::Item::QSchematicItemUserType + 1,
diff --git a/demo/items/operation.cpp b/demo/items/operation.cpp
index 867d1b81..5d3f11af 100644
--- a/demo/items/operation.cpp
+++ b/demo/items/operation.cpp
@@ -1,13 +1,13 @@
-#include "operation.h"
-#include "operationconnector.h"
+#include "operation.hpp"
+#include "operationconnector.hpp"
 #include "popup/popup_operation.hpp"
-#include "../commands/node_add_connector.h"
+#include "../commands/node_add_connector.hpp"
 
-#include <qschematic/scene.h>
-#include <qschematic/items/label.h>
-#include <qschematic/commands/item_remove.h>
-#include <qschematic/commands/item_visibility.h>
-#include <qschematic/commands/label_rename.h>
+#include <qschematic/scene.hpp>
+#include <qschematic/items/label.hpp>
+#include <qschematic/commands/item_remove.hpp>
+#include <qschematic/commands/item_visibility.hpp>
+#include <qschematic/commands/label_rename.hpp>
 
 #include <QPainter>
 #include <QMenu>
diff --git a/demo/items/operation.h b/demo/items/operation.hpp
similarity index 94%
rename from demo/items/operation.h
rename to demo/items/operation.hpp
index 059fd7da..503930b0 100644
--- a/demo/items/operation.h
+++ b/demo/items/operation.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "itemtypes.h"
+#include "itemtypes.hpp"
 
-#include <qschematic/items/node.h>
+#include <qschematic/items/node.hpp>
 
 namespace QSchematic::Items
 {
diff --git a/demo/items/operationconnector.cpp b/demo/items/operationconnector.cpp
index 9a40414c..39fb5211 100644
--- a/demo/items/operationconnector.cpp
+++ b/demo/items/operationconnector.cpp
@@ -1,12 +1,12 @@
-#include "operationconnector.h"
-#include "operation.h"
+#include "operationconnector.hpp"
+#include "operation.hpp"
 #include "popup/popup_connector.hpp"
 
-#include <qschematic/items/label.h>
-#include <qschematic/scene.h>
-#include <qschematic/commands/item_remove.h>
-#include <qschematic/commands/item_visibility.h>
-#include <qschematic/commands/label_rename.h>
+#include <qschematic/items/label.hpp>
+#include <qschematic/scene.hpp>
+#include <qschematic/commands/item_remove.hpp>
+#include <qschematic/commands/item_visibility.hpp>
+#include <qschematic/commands/label_rename.hpp>
 
 #include <QPainter>
 #include <QGraphicsSceneContextMenuEvent>
diff --git a/demo/items/operationconnector.h b/demo/items/operationconnector.hpp
similarity index 95%
rename from demo/items/operationconnector.h
rename to demo/items/operationconnector.hpp
index dd727f2d..c37ce58f 100644
--- a/demo/items/operationconnector.h
+++ b/demo/items/operationconnector.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/items/connector.h>
+#include <qschematic/items/connector.hpp>
 
 class OperationConnector : public QSchematic::Items::Connector
 {
diff --git a/demo/items/operationdemo1.cpp b/demo/items/operationdemo1.cpp
index 495990f9..bc04e050 100644
--- a/demo/items/operationdemo1.cpp
+++ b/demo/items/operationdemo1.cpp
@@ -1,8 +1,8 @@
-#include "operationdemo1.h"
-#include "operationconnector.h"
-#include "itemtypes.h"
+#include "operationdemo1.hpp"
+#include "operationconnector.hpp"
+#include "itemtypes.hpp"
 
-#include <qschematic/items/label.h>
+#include <qschematic/items/label.hpp>
 
 struct ConnectorAttribute {
     QPoint point;
diff --git a/demo/items/operationdemo1.h b/demo/items/operationdemo1.hpp
similarity index 95%
rename from demo/items/operationdemo1.h
rename to demo/items/operationdemo1.hpp
index 41a7ff78..995ddc91 100644
--- a/demo/items/operationdemo1.h
+++ b/demo/items/operationdemo1.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "operation.h"
+#include "operation.hpp"
 
 class OperationDemo1 : public Operation
 {
diff --git a/demo/items/popup/popup_connector.hpp b/demo/items/popup/popup_connector.hpp
index dfc78118..d6e02d84 100644
--- a/demo/items/popup/popup_connector.hpp
+++ b/demo/items/popup/popup_connector.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "popup.hpp"
-#include "../operationconnector.h"
+#include "../operationconnector.hpp"
 
-#include <qschematic/items/label.h>
+#include <qschematic/items/label.hpp>
 
 #include <QFormLayout>
 #include <QLabel>
diff --git a/demo/items/popup/popup_operation.hpp b/demo/items/popup/popup_operation.hpp
index 65ea25ae..983a03fd 100644
--- a/demo/items/popup/popup_operation.hpp
+++ b/demo/items/popup/popup_operation.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "popup.hpp"
-#include "../operation.h"
+#include "../operation.hpp"
 
-#include <qschematic/items/label.h>
+#include <qschematic/items/label.hpp>
 
 #include <QFormLayout>
 #include <QLabel>
diff --git a/demo/library/CMakeLists.txt b/demo/library/CMakeLists.txt
index 8604e69f..058505fe 100644
--- a/demo/library/CMakeLists.txt
+++ b/demo/library/CMakeLists.txt
@@ -1,12 +1,12 @@
 target_sources(
     ${TARGET}
     PRIVATE
-        iteminfo.h
+        iteminfo.hpp
         model.cpp
-        model.h
-        model_item.h
+        model.hpp
+        model_item.hpp
         view.cpp
-        view.h
+        view.hpp
         widget.cpp
-        widget.h
+        widget.hpp
 )
diff --git a/demo/library/iteminfo.h b/demo/library/iteminfo.hpp
similarity index 96%
rename from demo/library/iteminfo.h
rename to demo/library/iteminfo.hpp
index af84838f..5d6acd3d 100644
--- a/demo/library/iteminfo.h
+++ b/demo/library/iteminfo.hpp
@@ -3,7 +3,7 @@
 #include <QIcon>
 #include <QString>
 
-#include <qschematic/items/item.h>
+#include <qschematic/items/item.hpp>
 
 namespace QSchematic::Items
 {
diff --git a/demo/library/model.cpp b/demo/library/model.cpp
index f1eaf13a..15d7c8bb 100644
--- a/demo/library/model.cpp
+++ b/demo/library/model.cpp
@@ -1,12 +1,12 @@
-#include "model.h"
-#include "iteminfo.h"
-#include "../items/operation.h"
-#include "../items/operationdemo1.h"
-#include "../items/flowstart.h"
-#include "../items/flowend.h"
-
-#include <qschematic/items/itemmimedata.h>
-#include <qschematic/items/label.h>
+#include "model.hpp"
+#include "iteminfo.hpp"
+#include "../items/operation.hpp"
+#include "../items/operationdemo1.hpp"
+#include "../items/flowstart.hpp"
+#include "../items/flowend.hpp"
+
+#include <qschematic/items/itemmimedata.hpp>
+#include <qschematic/items/label.hpp>
 
 #include <QMimeData>
 
diff --git a/demo/library/model.h b/demo/library/model.hpp
similarity index 96%
rename from demo/library/model.h
rename to demo/library/model.hpp
index 7776fa1e..a742661b 100644
--- a/demo/library/model.h
+++ b/demo/library/model.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "model_item.h"
-#include "iteminfo.h"
+#include "model_item.hpp"
+#include "iteminfo.hpp"
 
 #include <QAbstractItemModel>
 
diff --git a/demo/library/model_item.h b/demo/library/model_item.hpp
similarity index 100%
rename from demo/library/model_item.h
rename to demo/library/model_item.hpp
diff --git a/demo/library/view.cpp b/demo/library/view.cpp
index 37879717..eab6939c 100644
--- a/demo/library/view.cpp
+++ b/demo/library/view.cpp
@@ -1,7 +1,7 @@
-#include "view.h"
+#include "view.hpp"
 
-#include <qschematic/items/item.h>
-#include <qschematic/items/itemmimedata.h>
+#include <qschematic/items/item.hpp>
+#include <qschematic/items/itemmimedata.hpp>
 
 #include <QDrag>
 #include <QPainter>
diff --git a/demo/library/view.h b/demo/library/view.hpp
similarity index 100%
rename from demo/library/view.h
rename to demo/library/view.hpp
diff --git a/demo/library/widget.cpp b/demo/library/widget.cpp
index 0af6c2da..3d5af7e2 100644
--- a/demo/library/widget.cpp
+++ b/demo/library/widget.cpp
@@ -1,8 +1,8 @@
 #include <QBoxLayout>
 
-#include "widget.h"
-#include "model.h"
-#include "view.h"
+#include "widget.hpp"
+#include "model.hpp"
+#include "view.hpp"
 
 using namespace Library;
 
diff --git a/demo/library/widget.h b/demo/library/widget.hpp
similarity index 100%
rename from demo/library/widget.h
rename to demo/library/widget.hpp
diff --git a/demo/main.cpp b/demo/main.cpp
index 987c68db..3ddfab5d 100644
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -1,6 +1,6 @@
 #include <QApplication>
 
-#include "mainwindow.h"
+#include "mainwindow.hpp"
 
 int main(int argc, char *argv[])
 {
diff --git a/demo/mainwindow.cpp b/demo/mainwindow.cpp
index 99eebbed..4010866d 100644
--- a/demo/mainwindow.cpp
+++ b/demo/mainwindow.cpp
@@ -1,20 +1,20 @@
-#include "mainwindow.h"
-#include "items/customitemfactory.h"
-#include "items/operation.h"
-#include "items/operationconnector.h"
-#include "items/fancywire.h"
-#include "library/widget.h"
-#include "netlist/widget.h"
+#include "mainwindow.hpp"
+#include "items/customitemfactory.hpp"
+#include "items/operation.hpp"
+#include "items/operationconnector.hpp"
+#include "items/fancywire.hpp"
+#include "library/widget.hpp"
+#include "netlist/widget.hpp"
 
 #include <gpds/archiver_xml.hpp>
-#include <qschematic/scene.h>
-#include <qschematic/view.h>
-#include <qschematic/commands/item_add.h>
-#include <qschematic/items/node.h>
-#include <qschematic/items/itemfactory.h>
-#include <qschematic/items/widget.h>
-#include <qschematic/netlist.h>
-#include <qschematic/netlistgenerator.h>
+#include <qschematic/scene.hpp>
+#include <qschematic/view.hpp>
+#include <qschematic/commands/item_add.hpp>
+#include <qschematic/items/node.hpp>
+#include <qschematic/items/itemfactory.hpp>
+#include <qschematic/items/widget.hpp>
+#include <qschematic/netlist.hpp>
+#include <qschematic/netlistgenerator.hpp>
 
 #include <QToolBar>
 #include <QAction>
diff --git a/demo/mainwindow.h b/demo/mainwindow.hpp
similarity index 97%
rename from demo/mainwindow.h
rename to demo/mainwindow.hpp
index cfb87e57..366f9b6e 100644
--- a/demo/mainwindow.h
+++ b/demo/mainwindow.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/settings.h>
+#include <qschematic/settings.hpp>
 
 #include <QMainWindow>
 
diff --git a/demo/netlist/CMakeLists.txt b/demo/netlist/CMakeLists.txt
index 8b243e16..f754f6ec 100644
--- a/demo/netlist/CMakeLists.txt
+++ b/demo/netlist/CMakeLists.txt
@@ -2,11 +2,11 @@ target_sources(
     ${TARGET}
     PRIVATE
         model.cpp
-        model.h
+        model.hpp
         viewer.cpp
-        viewer.h
+        viewer.hpp
         view.cpp
-        view.h
+        view.hpp
         widget.cpp
-        widget.h
+        widget.hpp
 )
diff --git a/demo/netlist/model.cpp b/demo/netlist/model.cpp
index 00cc1118..e327e89e 100644
--- a/demo/netlist/model.cpp
+++ b/demo/netlist/model.cpp
@@ -1,7 +1,7 @@
-#include "model.h"
-#include "../common/treeitem.h"
-#include "../items/operation.h"
-#include "../items/operationconnector.h"
+#include "model.hpp"
+#include "../common/treeitem.hpp"
+#include "../items/operation.hpp"
+#include "../items/operationconnector.hpp"
 
 using namespace Netlist;
 
diff --git a/demo/netlist/model.h b/demo/netlist/model.hpp
similarity index 87%
rename from demo/netlist/model.h
rename to demo/netlist/model.hpp
index ff049f25..d8f6519e 100644
--- a/demo/netlist/model.h
+++ b/demo/netlist/model.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <qschematic/netlist.h>
+#include <qschematic/netlist.hpp>
 
-#include "../common/treemodel.h"
+#include "../common/treemodel.hpp"
 
 class Operation;
 class OperationConnector;
diff --git a/demo/netlist/view.cpp b/demo/netlist/view.cpp
index 5463cc75..350f6972 100644
--- a/demo/netlist/view.cpp
+++ b/demo/netlist/view.cpp
@@ -1,4 +1,4 @@
-#include "view.h"
+#include "view.hpp"
 
 using namespace Netlist;
 
diff --git a/demo/netlist/view.h b/demo/netlist/view.hpp
similarity index 100%
rename from demo/netlist/view.h
rename to demo/netlist/view.hpp
diff --git a/demo/netlist/viewer.cpp b/demo/netlist/viewer.cpp
index e290e914..aee98fc4 100644
--- a/demo/netlist/viewer.cpp
+++ b/demo/netlist/viewer.cpp
@@ -1,6 +1,6 @@
-#include "viewer.h"
-#include "model.h"
-#include "view.h"
+#include "viewer.hpp"
+#include "model.hpp"
+#include "view.hpp"
 
 #include <QBoxLayout>
 
diff --git a/demo/netlist/viewer.h b/demo/netlist/viewer.hpp
similarity index 93%
rename from demo/netlist/viewer.h
rename to demo/netlist/viewer.hpp
index c0cd47cd..bc2eb6cb 100644
--- a/demo/netlist/viewer.h
+++ b/demo/netlist/viewer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/netlist.h>
+#include <qschematic/netlist.hpp>
 
 #include <QWidget>
 
diff --git a/demo/netlist/widget.cpp b/demo/netlist/widget.cpp
index fdceb3aa..3d9d71c0 100644
--- a/demo/netlist/widget.cpp
+++ b/demo/netlist/widget.cpp
@@ -1,9 +1,9 @@
-#include "widget.h"
-#include "viewer.h"
-#include "../items/operation.h"
-#include "../items/operationconnector.h"
+#include "widget.hpp"
+#include "viewer.hpp"
+#include "../items/operation.hpp"
+#include "../items/operationconnector.hpp"
 
-#include <qschematic/netlist_writer_json.h>
+#include <qschematic/netlist_writer_json.hpp>
 
 #include <QJsonDocument>
 #include <QVBoxLayout>
diff --git a/demo/netlist/widget.h b/demo/netlist/widget.hpp
similarity index 94%
rename from demo/netlist/widget.h
rename to demo/netlist/widget.hpp
index 4caef5eb..4d334020 100644
--- a/demo/netlist/widget.h
+++ b/demo/netlist/widget.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qschematic/netlist.h>
+#include <qschematic/netlist.hpp>
 
 #include <QWidget>
 
diff --git a/qschematic/CMakeLists.txt b/qschematic/CMakeLists.txt
index 2385ee6d..ec56b33a 100644
--- a/qschematic/CMakeLists.txt
+++ b/qschematic/CMakeLists.txt
@@ -30,46 +30,46 @@ function(setup_target_common target)
             HEADERS
             BASE_DIRS ${QSCHEMATIC_BASE_DIR}
             FILES
-                commands/base.h
-                commands/item_add.h
-                commands/item_move.h
-                commands/item_remove.h
-                commands/item_visibility.h
-                commands/label_rename.h
-                commands/rectitem_resize.h
-                commands/rectitem_rotate.h
-                commands/commands.h
-                commands/wirenet_rename.h
-                commands/wirepoint_move.h
-                items/itemfunctions.h
-                items/connector.h
-                items/item.h
-                items/itemfactory.h
-                items/itemmimedata.h
-                items/label.h
-                items/node.h
-                items/rectitem.h
-                items/splinewire.h
-                items/widget.h
-                items/wire.h
-                items/wirenet.h
-                items/wireroundedcorners.h
-                utils/itemscontainerutils.h
-                utils/itemscustodian.h
-                wire_system/connectable.h
-                wire_system/line.h
-                wire_system/manager.h
-                wire_system/wire.h
-                wire_system/point.h
-                wire_system/net.h
-                netlist.h
-                netlist_writer_json.h
-                netlistgenerator.h
-                scene.h
-                settings.h
-                types.h
-                utils.h
-                view.h
+                commands/base.hpp
+                commands/item_add.hpp
+                commands/item_move.hpp
+                commands/item_remove.hpp
+                commands/item_visibility.hpp
+                commands/label_rename.hpp
+                commands/rectitem_resize.hpp
+                commands/rectitem_rotate.hpp
+                commands/commands.hpp
+                commands/wirenet_rename.hpp
+                commands/wirepoint_move.hpp
+                items/itemfunctions.hpp
+                items/connector.hpp
+                items/item.hpp
+                items/itemfactory.hpp
+                items/itemmimedata.hpp
+                items/label.hpp
+                items/node.hpp
+                items/rectitem.hpp
+                items/splinewire.hpp
+                items/widget.hpp
+                items/wire.hpp
+                items/wirenet.hpp
+                items/wireroundedcorners.hpp
+                utils/itemscontainerutils.hpp
+                utils/itemscustodian.hpp
+                wire_system/connectable.hpp
+                wire_system/line.hpp
+                wire_system/manager.hpp
+                wire_system/wire.hpp
+                wire_system/point.hpp
+                wire_system/net.hpp
+                netlist.hpp
+                netlist_writer_json.hpp
+                netlistgenerator.hpp
+                scene.hpp
+                settings.hpp
+                types.hpp
+                utils.hpp
+                view.hpp
 
         PRIVATE
             commands/base.cpp
diff --git a/qschematic/commands/base.cpp b/qschematic/commands/base.cpp
index b66d9ab3..59075c05 100644
--- a/qschematic/commands/base.cpp
+++ b/qschematic/commands/base.cpp
@@ -1,5 +1,5 @@
-#include "commands.h"
-#include "base.h"
+#include "commands.hpp"
+#include "base.hpp"
 
 using namespace QSchematic::Commands;
 
diff --git a/qschematic/commands/base.h b/qschematic/commands/base.hpp
similarity index 100%
rename from qschematic/commands/base.h
rename to qschematic/commands/base.hpp
diff --git a/qschematic/commands/commands.h b/qschematic/commands/commands.hpp
similarity index 100%
rename from qschematic/commands/commands.h
rename to qschematic/commands/commands.hpp
diff --git a/qschematic/commands/item_add.cpp b/qschematic/commands/item_add.cpp
index bd2dab89..2ccb6207 100644
--- a/qschematic/commands/item_add.cpp
+++ b/qschematic/commands/item_add.cpp
@@ -1,8 +1,8 @@
-#include "commands.h"
-#include "item_add.h"
-#include "../items/item.h"
-#include "../items/wire.h"
-#include "../scene.h"
+#include "commands.hpp"
+#include "item_add.hpp"
+#include "../items/item.hpp"
+#include "../items/wire.hpp"
+#include "../scene.hpp"
 
 using namespace QSchematic;
 using namespace QSchematic::Commands;
diff --git a/qschematic/commands/item_add.h b/qschematic/commands/item_add.hpp
similarity index 96%
rename from qschematic/commands/item_add.h
rename to qschematic/commands/item_add.hpp
index 141519b3..770738d0 100644
--- a/qschematic/commands/item_add.h
+++ b/qschematic/commands/item_add.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <QPointer>
 #include <memory>
diff --git a/qschematic/commands/item_move.cpp b/qschematic/commands/item_move.cpp
index 2e7fa8f8..663c3750 100644
--- a/qschematic/commands/item_move.cpp
+++ b/qschematic/commands/item_move.cpp
@@ -1,7 +1,7 @@
-#include "commands.h"
-#include "item_move.h"
-#include "../items/item.h"
-#include "../items/wire.h"
+#include "commands.hpp"
+#include "item_move.hpp"
+#include "../items/item.hpp"
+#include "../items/wire.hpp"
 
 #include <memory>
 
diff --git a/qschematic/commands/item_move.h b/qschematic/commands/item_move.hpp
similarity index 97%
rename from qschematic/commands/item_move.h
rename to qschematic/commands/item_move.hpp
index 35e67a23..3a522fa7 100644
--- a/qschematic/commands/item_move.h
+++ b/qschematic/commands/item_move.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <QVector>
 #include <QVector2D>
diff --git a/qschematic/commands/item_remove.cpp b/qschematic/commands/item_remove.cpp
index 036550c2..2436ebb1 100644
--- a/qschematic/commands/item_remove.cpp
+++ b/qschematic/commands/item_remove.cpp
@@ -1,8 +1,8 @@
-#include "commands.h"
-#include "item_remove.h"
-#include "../items/item.h"
-#include "../items/wire.h"
-#include "../scene.h"
+#include "commands.hpp"
+#include "item_remove.hpp"
+#include "../items/item.hpp"
+#include "../items/wire.hpp"
+#include "../scene.hpp"
 
 using namespace QSchematic;
 using namespace QSchematic::Commands;
diff --git a/qschematic/commands/item_remove.h b/qschematic/commands/item_remove.hpp
similarity index 97%
rename from qschematic/commands/item_remove.h
rename to qschematic/commands/item_remove.hpp
index 822aefe9..8c7beb6b 100644
--- a/qschematic/commands/item_remove.h
+++ b/qschematic/commands/item_remove.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <QPointer>
 
diff --git a/qschematic/commands/item_visibility.cpp b/qschematic/commands/item_visibility.cpp
index 9ab38b1a..c101bbaa 100644
--- a/qschematic/commands/item_visibility.cpp
+++ b/qschematic/commands/item_visibility.cpp
@@ -1,6 +1,6 @@
-#include "item_visibility.h"
-#include "commands.h"
-#include "../items/item.h"
+#include "item_visibility.hpp"
+#include "commands.hpp"
+#include "../items/item.hpp"
 
 using namespace QSchematic;
 using namespace QSchematic::Commands;
diff --git a/qschematic/commands/item_visibility.h b/qschematic/commands/item_visibility.hpp
similarity index 96%
rename from qschematic/commands/item_visibility.h
rename to qschematic/commands/item_visibility.hpp
index b8060fe1..30699625 100644
--- a/qschematic/commands/item_visibility.h
+++ b/qschematic/commands/item_visibility.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <memory>
 
diff --git a/qschematic/commands/label_rename.cpp b/qschematic/commands/label_rename.cpp
index c3376fe8..473d17d0 100644
--- a/qschematic/commands/label_rename.cpp
+++ b/qschematic/commands/label_rename.cpp
@@ -1,6 +1,6 @@
-#include "commands.h"
-#include "label_rename.h"
-#include "../items/label.h"
+#include "commands.hpp"
+#include "label_rename.hpp"
+#include "../items/label.hpp"
 
 using namespace QSchematic;
 using namespace QSchematic::Commands;
diff --git a/qschematic/commands/label_rename.h b/qschematic/commands/label_rename.hpp
similarity index 96%
rename from qschematic/commands/label_rename.h
rename to qschematic/commands/label_rename.hpp
index c2a839c9..b1c40de2 100644
--- a/qschematic/commands/label_rename.h
+++ b/qschematic/commands/label_rename.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <QPointer>
 
diff --git a/qschematic/commands/rectitem_resize.cpp b/qschematic/commands/rectitem_resize.cpp
index 6787412e..25c29906 100644
--- a/qschematic/commands/rectitem_resize.cpp
+++ b/qschematic/commands/rectitem_resize.cpp
@@ -1,6 +1,6 @@
-#include "../items/rectitem.h"
-#include "commands.h"
-#include "rectitem_resize.h"
+#include "../items/rectitem.hpp"
+#include "commands.hpp"
+#include "rectitem_resize.hpp"
 
 using namespace QSchematic;
 using namespace QSchematic::Commands;
diff --git a/qschematic/commands/rectitem_resize.h b/qschematic/commands/rectitem_resize.hpp
similarity index 97%
rename from qschematic/commands/rectitem_resize.h
rename to qschematic/commands/rectitem_resize.hpp
index 74b8e97d..fccc3c7b 100644
--- a/qschematic/commands/rectitem_resize.h
+++ b/qschematic/commands/rectitem_resize.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <QPointer>
 #include <QPoint>
diff --git a/qschematic/commands/rectitem_rotate.cpp b/qschematic/commands/rectitem_rotate.cpp
index afdbcd5a..5ceb4f83 100644
--- a/qschematic/commands/rectitem_rotate.cpp
+++ b/qschematic/commands/rectitem_rotate.cpp
@@ -1,6 +1,6 @@
-#include "commands.h"
-#include "rectitem_rotate.h"
-#include "../items/rectitem.h"
+#include "commands.hpp"
+#include "rectitem_rotate.hpp"
+#include "../items/rectitem.hpp"
 
 #include <memory>
 
diff --git a/qschematic/commands/rectitem_rotate.h b/qschematic/commands/rectitem_rotate.hpp
similarity index 96%
rename from qschematic/commands/rectitem_rotate.h
rename to qschematic/commands/rectitem_rotate.hpp
index 482eeb89..bd845ac3 100644
--- a/qschematic/commands/rectitem_rotate.h
+++ b/qschematic/commands/rectitem_rotate.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <QPointer>
 #include <QPoint>
diff --git a/qschematic/commands/wirenet_rename.cpp b/qschematic/commands/wirenet_rename.cpp
index 48b10365..29b2d8de 100644
--- a/qschematic/commands/wirenet_rename.cpp
+++ b/qschematic/commands/wirenet_rename.cpp
@@ -1,8 +1,8 @@
-#include "commands.h"
-#include "wirenet_rename.h"
-#include "../items/label.h"
-#include "../items/wire.h"
-#include "../items/wirenet.h"
+#include "commands.hpp"
+#include "wirenet_rename.hpp"
+#include "../items/label.hpp"
+#include "../items/wire.hpp"
+#include "../items/wirenet.hpp"
 
 using namespace QSchematic;
 using namespace QSchematic::Commands;
diff --git a/qschematic/commands/wirenet_rename.h b/qschematic/commands/wirenet_rename.hpp
similarity index 96%
rename from qschematic/commands/wirenet_rename.h
rename to qschematic/commands/wirenet_rename.hpp
index f7695272..d26dbf50 100644
--- a/qschematic/commands/wirenet_rename.h
+++ b/qschematic/commands/wirenet_rename.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "base.h"
+#include "base.hpp"
 
 #include <memory>
 
diff --git a/qschematic/commands/wirepoint_move.cpp b/qschematic/commands/wirepoint_move.cpp
index 26d3b7c4..1165dea1 100644
--- a/qschematic/commands/wirepoint_move.cpp
+++ b/qschematic/commands/wirepoint_move.cpp
@@ -1,7 +1,7 @@
-#include "commands.h"
-#include "wirepoint_move.h"
-#include "../scene.h"
-#include "../items/item.h"
+#include "commands.hpp"
+#include "wirepoint_move.hpp"
+#include "../scene.hpp"
+#include "../items/item.hpp"
 
 using namespace QSchematic;
 using namespace QSchematic::Commands;
diff --git a/qschematic/commands/wirepoint_move.h b/qschematic/commands/wirepoint_move.hpp
similarity index 94%
rename from qschematic/commands/wirepoint_move.h
rename to qschematic/commands/wirepoint_move.hpp
index 46494047..316ebed3 100644
--- a/qschematic/commands/wirepoint_move.h
+++ b/qschematic/commands/wirepoint_move.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base.h"
-#include "../items/wire.h"
+#include "base.hpp"
+#include "../items/wire.hpp"
 
 #include <QVector>
 #include <QVector2D>
diff --git a/qschematic/items/connector.cpp b/qschematic/items/connector.cpp
index 085145b6..133fea9b 100644
--- a/qschematic/items/connector.cpp
+++ b/qschematic/items/connector.cpp
@@ -1,9 +1,9 @@
-#include "connector.h"
-#include "label.h"
-#include "node.h"
-#include "wire.h"
-#include "../scene.h"
-#include "../utils.h"
+#include "connector.hpp"
+#include "label.hpp"
+#include "node.hpp"
+#include "wire.hpp"
+#include "../scene.hpp"
+#include "../utils.hpp"
 
 #include <QtMath>
 #include <QPainter>
diff --git a/qschematic/items/connector.h b/qschematic/items/connector.hpp
similarity index 97%
rename from qschematic/items/connector.h
rename to qschematic/items/connector.hpp
index a0bc17c5..a135ce78 100644
--- a/qschematic/items/connector.h
+++ b/qschematic/items/connector.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "item.h"
-#include "../wire_system/connectable.h"
+#include "item.hpp"
+#include "../wire_system/connectable.hpp"
 
 namespace QSchematic::Items
 {
diff --git a/qschematic/items/item.cpp b/qschematic/items/item.cpp
index 5aa29746..da19dc71 100644
--- a/qschematic/items/item.cpp
+++ b/qschematic/items/item.cpp
@@ -1,6 +1,6 @@
-#include "item.h"
-#include "../scene.h"
-#include "../commands/item_move.h"
+#include "item.hpp"
+#include "../scene.hpp"
+#include "../commands/item_move.hpp"
 
 #include <QDebug>
 #include <QPainter>
diff --git a/qschematic/items/item.h b/qschematic/items/item.hpp
similarity index 98%
rename from qschematic/items/item.h
rename to qschematic/items/item.hpp
index d8afb320..f10790d5 100644
--- a/qschematic/items/item.h
+++ b/qschematic/items/item.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "itemfunctions.h"
-#include "../types.h"
-#include "../settings.h"
+#include "itemfunctions.hpp"
+#include "../types.hpp"
+#include "../settings.hpp"
 
 #include <gpds/serialize.hpp>
 #include <QDebug>
diff --git a/qschematic/items/itemfactory.cpp b/qschematic/items/itemfactory.cpp
index fd6c6f6f..5bd3e69c 100644
--- a/qschematic/items/itemfactory.cpp
+++ b/qschematic/items/itemfactory.cpp
@@ -1,10 +1,10 @@
-#include "itemfactory.h"
-#include "node.h"
-#include "wire.h"
-#include "wireroundedcorners.h"
-#include "splinewire.h"
-#include "connector.h"
-#include "label.h"
+#include "itemfactory.hpp"
+#include "node.hpp"
+#include "wire.hpp"
+#include "wireroundedcorners.hpp"
+#include "splinewire.hpp"
+#include "connector.hpp"
+#include "label.hpp"
 
 using namespace QSchematic::Items;
 
diff --git a/qschematic/items/itemfactory.h b/qschematic/items/itemfactory.hpp
similarity index 97%
rename from qschematic/items/itemfactory.h
rename to qschematic/items/itemfactory.hpp
index bb5a833c..9f546817 100644
--- a/qschematic/items/itemfactory.h
+++ b/qschematic/items/itemfactory.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "item.h"
+#include "item.hpp"
 
 #include <functional>
 #include <memory>
diff --git a/qschematic/items/itemfunctions.h b/qschematic/items/itemfunctions.hpp
similarity index 100%
rename from qschematic/items/itemfunctions.h
rename to qschematic/items/itemfunctions.hpp
diff --git a/qschematic/items/itemmimedata.cpp b/qschematic/items/itemmimedata.cpp
index 4764d067..c66c33c4 100644
--- a/qschematic/items/itemmimedata.cpp
+++ b/qschematic/items/itemmimedata.cpp
@@ -1,4 +1,4 @@
-#include "itemmimedata.h"
+#include "itemmimedata.hpp"
 
 #include <utility>
 
diff --git a/qschematic/items/itemmimedata.h b/qschematic/items/itemmimedata.hpp
similarity index 96%
rename from qschematic/items/itemmimedata.h
rename to qschematic/items/itemmimedata.hpp
index bad3c4ab..efe30cb0 100644
--- a/qschematic/items/itemmimedata.h
+++ b/qschematic/items/itemmimedata.hpp
@@ -1,4 +1,4 @@
-#include "item.h"
+#include "item.hpp"
 
 #include <QMimeData>
 
diff --git a/qschematic/items/label.cpp b/qschematic/items/label.cpp
index 053d33fc..44664a12 100644
--- a/qschematic/items/label.cpp
+++ b/qschematic/items/label.cpp
@@ -1,5 +1,5 @@
-#include "label.h"
-#include "../scene.h"
+#include "label.hpp"
+#include "../scene.hpp"
 
 #include <QFontMetricsF>
 #include <QPainter>
diff --git a/qschematic/items/label.h b/qschematic/items/label.hpp
similarity index 98%
rename from qschematic/items/label.h
rename to qschematic/items/label.hpp
index de628486..aa73ca0c 100644
--- a/qschematic/items/label.h
+++ b/qschematic/items/label.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "item.h"
+#include "item.hpp"
 
 #include <QFont>
 
diff --git a/qschematic/items/node.cpp b/qschematic/items/node.cpp
index 723a9e2b..7f533fd8 100644
--- a/qschematic/items/node.cpp
+++ b/qschematic/items/node.cpp
@@ -1,7 +1,7 @@
-#include "node.h"
-#include "itemfactory.h"
-#include "../utils.h"
-#include "../scene.h"
+#include "node.hpp"
+#include "itemfactory.hpp"
+#include "../utils.hpp"
+#include "../scene.hpp"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
diff --git a/qschematic/items/node.h b/qschematic/items/node.hpp
similarity index 96%
rename from qschematic/items/node.h
rename to qschematic/items/node.hpp
index 9a83b02a..f9172b8f 100644
--- a/qschematic/items/node.h
+++ b/qschematic/items/node.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "rectitem.h"
-#include "connector.h"
-#include "../types.h"
+#include "rectitem.hpp"
+#include "connector.hpp"
+#include "../types.hpp"
 
 #include <QList>
 
diff --git a/qschematic/items/rectitem.cpp b/qschematic/items/rectitem.cpp
index cd1ce09c..47879ac4 100644
--- a/qschematic/items/rectitem.cpp
+++ b/qschematic/items/rectitem.cpp
@@ -1,8 +1,8 @@
-#include "rectitem.h"
-#include "../utils.h"
-#include "../scene.h"
-#include "../commands/rectitem_resize.h"
-#include "../commands/rectitem_rotate.h"
+#include "rectitem.hpp"
+#include "../utils.hpp"
+#include "../scene.hpp"
+#include "../commands/rectitem_resize.hpp"
+#include "../commands/rectitem_rotate.hpp"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
diff --git a/qschematic/items/rectitem.h b/qschematic/items/rectitem.hpp
similarity index 98%
rename from qschematic/items/rectitem.h
rename to qschematic/items/rectitem.hpp
index 4f0c8b9c..35b29f4d 100644
--- a/qschematic/items/rectitem.h
+++ b/qschematic/items/rectitem.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "item.h"
-#include "../types.h"
+#include "item.hpp"
+#include "../types.hpp"
 
 #include <QList>
 
diff --git a/qschematic/items/splinewire.cpp b/qschematic/items/splinewire.cpp
index 0f6cdc45..8428a24b 100644
--- a/qschematic/items/splinewire.cpp
+++ b/qschematic/items/splinewire.cpp
@@ -1,4 +1,4 @@
-#include "splinewire.h"
+#include "splinewire.hpp"
 
 #include <QPainter>
 #include <QPainterPathStroker>
diff --git a/qschematic/items/splinewire.h b/qschematic/items/splinewire.hpp
similarity index 96%
rename from qschematic/items/splinewire.h
rename to qschematic/items/splinewire.hpp
index 72875493..65224917 100644
--- a/qschematic/items/splinewire.h
+++ b/qschematic/items/splinewire.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "wire.h"
+#include "wire.hpp"
 
 namespace QSchematic::Items
 {
diff --git a/qschematic/items/widget.cpp b/qschematic/items/widget.cpp
index 28d6b481..7891b434 100644
--- a/qschematic/items/widget.cpp
+++ b/qschematic/items/widget.cpp
@@ -1,5 +1,5 @@
-#include "widget.h"
-#include "../scene.h"
+#include "widget.hpp"
+#include "../scene.hpp"
 
 #include <QGraphicsRectItem>
 #include <QGraphicsProxyWidget>
diff --git a/qschematic/items/widget.h b/qschematic/items/widget.hpp
similarity index 97%
rename from qschematic/items/widget.h
rename to qschematic/items/widget.hpp
index 1ae0c22b..7829509f 100644
--- a/qschematic/items/widget.h
+++ b/qschematic/items/widget.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "rectitem.h"
+#include "rectitem.hpp"
 
 class QGraphicsProxyWidget;
 
diff --git a/qschematic/items/wire.cpp b/qschematic/items/wire.cpp
index d640c5c8..3a32c370 100644
--- a/qschematic/items/wire.cpp
+++ b/qschematic/items/wire.cpp
@@ -1,10 +1,10 @@
-#include "wire.h"
-#include "connector.h"
-#include "label.h"
-#include "node.h"
-#include "../scene.h"
-#include "../utils.h"
-#include "../commands/wirepoint_move.h"
+#include "wire.hpp"
+#include "connector.hpp"
+#include "label.hpp"
+#include "node.hpp"
+#include "../scene.hpp"
+#include "../utils.hpp"
+#include "../commands/wirepoint_move.hpp"
 
 #include <QPen>
 #include <QBrush>
diff --git a/qschematic/items/wire.h b/qschematic/items/wire.hpp
similarity index 96%
rename from qschematic/items/wire.h
rename to qschematic/items/wire.hpp
index a3874caf..2598e69c 100644
--- a/qschematic/items/wire.h
+++ b/qschematic/items/wire.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "item.h"
-#include "wirenet.h"
-#include "../wire_system/point.h"
-#include "../wire_system/wire.h"
+#include "item.hpp"
+#include "wirenet.hpp"
+#include "../wire_system/point.hpp"
+#include "../wire_system/wire.hpp"
 
 #include <QAction>
 
diff --git a/qschematic/items/wirenet.cpp b/qschematic/items/wirenet.cpp
index 59662448..35335bd2 100644
--- a/qschematic/items/wirenet.cpp
+++ b/qschematic/items/wirenet.cpp
@@ -1,10 +1,10 @@
-#include "connector.h"
-#include "wirenet.h"
-#include "wire.h"
-#include "label.h"
-#include "itemfactory.h"
-#include "../scene.h"
-#include "../utils.h"
+#include "connector.hpp"
+#include "wirenet.hpp"
+#include "wire.hpp"
+#include "label.hpp"
+#include "itemfactory.hpp"
+#include "../scene.hpp"
+#include "../utils.hpp"
 
 #include <QVector2D>
 
diff --git a/qschematic/items/wirenet.h b/qschematic/items/wirenet.hpp
similarity index 96%
rename from qschematic/items/wirenet.h
rename to qschematic/items/wirenet.hpp
index 258d9217..cdc76a77 100644
--- a/qschematic/items/wirenet.h
+++ b/qschematic/items/wirenet.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../wire_system/line.h"
-#include "../wire_system/net.h"
+#include "../wire_system/line.hpp"
+#include "../wire_system/net.hpp"
 
 #include <gpds/serialize.hpp>
 #include <QObject>
diff --git a/qschematic/items/wireroundedcorners.cpp b/qschematic/items/wireroundedcorners.cpp
index daea5646..218117f5 100644
--- a/qschematic/items/wireroundedcorners.cpp
+++ b/qschematic/items/wireroundedcorners.cpp
@@ -1,7 +1,7 @@
-#include "wireroundedcorners.h"
-#include "../utils.h"
-#include "../wire_system/point.h"
-#include "../wire_system/line.h"
+#include "wireroundedcorners.hpp"
+#include "../utils.hpp"
+#include "../wire_system/point.hpp"
+#include "../wire_system/line.hpp"
 
 #include <QPainter>
 #include <QVector2D>
diff --git a/qschematic/items/wireroundedcorners.h b/qschematic/items/wireroundedcorners.hpp
similarity index 97%
rename from qschematic/items/wireroundedcorners.h
rename to qschematic/items/wireroundedcorners.hpp
index b056c1c4..a56360f6 100644
--- a/qschematic/items/wireroundedcorners.h
+++ b/qschematic/items/wireroundedcorners.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "wire.h"
+#include "wire.hpp"
 
 namespace QSchematic::Items
 {
diff --git a/qschematic/netlist.h b/qschematic/netlist.hpp
similarity index 95%
rename from qschematic/netlist.h
rename to qschematic/netlist.hpp
index b3f80472..bec2e281 100644
--- a/qschematic/netlist.h
+++ b/qschematic/netlist.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "items/wire.h"
-#include "items/connector.h"
-#include "items/node.h"
-#include "items/label.h"
+#include "items/wire.hpp"
+#include "items/connector.hpp"
+#include "items/node.hpp"
+#include "items/label.hpp"
 
 #include <vector>
 #include <forward_list>
diff --git a/qschematic/netlist_writer_json.h b/qschematic/netlist_writer_json.hpp
similarity index 98%
rename from qschematic/netlist_writer_json.h
rename to qschematic/netlist_writer_json.hpp
index 19dd5506..5f2b4390 100644
--- a/qschematic/netlist_writer_json.h
+++ b/qschematic/netlist_writer_json.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "netlist.h"
+#include "netlist.hpp"
 
 #include <QJsonArray>
 #include <QJsonObject>
diff --git a/qschematic/netlistgenerator.h b/qschematic/netlistgenerator.hpp
similarity index 98%
rename from qschematic/netlistgenerator.h
rename to qschematic/netlistgenerator.hpp
index 31c42609..043ffbe4 100644
--- a/qschematic/netlistgenerator.h
+++ b/qschematic/netlistgenerator.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "netlist.h"
-#include "scene.h"
-#include "items/wirenet.h"
-#include "items/node.h"
+#include "netlist.hpp"
+#include "scene.hpp"
+#include "items/wirenet.hpp"
+#include "items/node.hpp"
 
 namespace QSchematic
 {
diff --git a/qschematic/scene.cpp b/qschematic/scene.cpp
index f963fffa..b688c960 100644
--- a/qschematic/scene.cpp
+++ b/qschematic/scene.cpp
@@ -8,17 +8,17 @@
 #include <QtMath>
 #include <QTimer>
 
-#include "scene.h"
-#include "commands/item_move.h"
-#include "commands/item_add.h"
-#include "commands/item_remove.h"
-#include "items/itemfactory.h"
-#include "items/item.h"
-#include "items/itemmimedata.h"
-#include "items/node.h"
-#include "items/label.h"
-#include "items/widget.h"
-#include "utils/itemscontainerutils.h"
+#include "scene.hpp"
+#include "commands/item_move.hpp"
+#include "commands/item_add.hpp"
+#include "commands/item_remove.hpp"
+#include "items/itemfactory.hpp"
+#include "items/item.hpp"
+#include "items/itemmimedata.hpp"
+#include "items/node.hpp"
+#include "items/label.hpp"
+#include "items/widget.hpp"
+#include "utils/itemscontainerutils.hpp"
 
 using namespace QSchematic;
 
diff --git a/qschematic/scene.h b/qschematic/scene.hpp
similarity index 98%
rename from qschematic/scene.h
rename to qschematic/scene.hpp
index ecda69a3..ec4ebbf5 100644
--- a/qschematic/scene.h
+++ b/qschematic/scene.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "settings.h"
-#include "items/item.h"
-#include "items/wire.h"
-#include "wire_system/manager.h"
+#include "settings.hpp"
+#include "items/item.hpp"
+#include "items/wire.hpp"
+#include "wire_system/manager.hpp"
 //#include "utils/itemscustodian.h"
 
 #include <gpds/serialize.hpp>
diff --git a/qschematic/settings.cpp b/qschematic/settings.cpp
index c6f2b795..b5cd24fb 100644
--- a/qschematic/settings.cpp
+++ b/qschematic/settings.cpp
@@ -1,4 +1,4 @@
-#include "settings.h"
+#include "settings.hpp"
 
 #include <QPointF>
 #include <QRectF>
diff --git a/qschematic/settings.h b/qschematic/settings.hpp
similarity index 100%
rename from qschematic/settings.h
rename to qschematic/settings.hpp
diff --git a/qschematic/types.h b/qschematic/types.hpp
similarity index 100%
rename from qschematic/types.h
rename to qschematic/types.hpp
diff --git a/qschematic/utils.cpp b/qschematic/utils.cpp
index eb45ad06..47950acc 100644
--- a/qschematic/utils.cpp
+++ b/qschematic/utils.cpp
@@ -1,5 +1,5 @@
-#include "wire_system/line.h"
-#include "utils.h"
+#include "wire_system/line.hpp"
+#include "utils.hpp"
 
 #include <QPoint>
 #include <QLine>
diff --git a/qschematic/utils.h b/qschematic/utils.hpp
similarity index 99%
rename from qschematic/utils.h
rename to qschematic/utils.hpp
index 596be05c..5619b7ed 100644
--- a/qschematic/utils.h
+++ b/qschematic/utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "types.hpp"
 
 #include <QVector>
 
diff --git a/qschematic/utils/itemscontainerutils.h b/qschematic/utils/itemscontainerutils.hpp
similarity index 96%
rename from qschematic/utils/itemscontainerutils.h
rename to qschematic/utils/itemscontainerutils.hpp
index a402b0de..0c2bda85 100644
--- a/qschematic/utils/itemscontainerutils.h
+++ b/qschematic/utils/itemscontainerutils.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../items/item.h"
+#include "../items/item.hpp"
 
 #include <QList>
 
diff --git a/qschematic/utils/itemscustodian.h b/qschematic/utils/itemscustodian.hpp
similarity index 98%
rename from qschematic/utils/itemscustodian.h
rename to qschematic/utils/itemscustodian.hpp
index 9e376134..faab5c95 100644
--- a/qschematic/utils/itemscustodian.h
+++ b/qschematic/utils/itemscustodian.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "items/item.h"
+#include "items/item.hpp"
 
 #include <QObject>
 
diff --git a/qschematic/view.cpp b/qschematic/view.cpp
index 97b5b882..11f9c2fa 100644
--- a/qschematic/view.cpp
+++ b/qschematic/view.cpp
@@ -3,10 +3,10 @@
 #include <QScrollBar>
 #include <QtMath>
 
-#include "view.h"
-#include "scene.h"
-#include "settings.h"
-#include "commands/item_remove.h"
+#include "view.hpp"
+#include "scene.hpp"
+#include "settings.hpp"
+#include "commands/item_remove.hpp"
 
 using namespace QSchematic;
 
diff --git a/qschematic/view.h b/qschematic/view.hpp
similarity index 99%
rename from qschematic/view.h
rename to qschematic/view.hpp
index 94b39917..9f99fb71 100644
--- a/qschematic/view.h
+++ b/qschematic/view.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "scene.h"
+#include "scene.hpp"
 
 #include <QGraphicsView>
 
diff --git a/qschematic/wire_system/connectable.h b/qschematic/wire_system/connectable.hpp
similarity index 100%
rename from qschematic/wire_system/connectable.h
rename to qschematic/wire_system/connectable.hpp
diff --git a/qschematic/wire_system/line.cpp b/qschematic/wire_system/line.cpp
index 627835cc..7339d15e 100644
--- a/qschematic/wire_system/line.cpp
+++ b/qschematic/wire_system/line.cpp
@@ -1,5 +1,5 @@
-#include "line.h"
-#include "../utils.h"
+#include "line.hpp"
+#include "../utils.hpp"
 
 #include <QtGlobal>
 #include <QLineF>
diff --git a/qschematic/wire_system/line.h b/qschematic/wire_system/line.hpp
similarity index 100%
rename from qschematic/wire_system/line.h
rename to qschematic/wire_system/line.hpp
diff --git a/qschematic/wire_system/manager.cpp b/qschematic/wire_system/manager.cpp
index 1531d2a8..d11e2e52 100644
--- a/qschematic/wire_system/manager.cpp
+++ b/qschematic/wire_system/manager.cpp
@@ -1,8 +1,8 @@
-#include "manager.h"
-#include "net.h"
-#include "point.h"
-#include "wire.h"
-#include "connectable.h"
+#include "manager.hpp"
+#include "net.hpp"
+#include "point.hpp"
+#include "wire.hpp"
+#include "connectable.hpp"
 
 #include <QVector>
 #include <QVector2D>
diff --git a/qschematic/wire_system/manager.h b/qschematic/wire_system/manager.hpp
similarity index 99%
rename from qschematic/wire_system/manager.h
rename to qschematic/wire_system/manager.hpp
index aeb6d567..a66d3e50 100644
--- a/qschematic/wire_system/manager.h
+++ b/qschematic/wire_system/manager.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../settings.h"
+#include "../settings.hpp"
 
 #include <QObject>
 #include <QList>
diff --git a/qschematic/wire_system/net.cpp b/qschematic/wire_system/net.cpp
index 5d4f3a67..78f40712 100644
--- a/qschematic/wire_system/net.cpp
+++ b/qschematic/wire_system/net.cpp
@@ -1,5 +1,5 @@
-#include "net.h"
-#include "wire.h"
+#include "net.hpp"
+#include "wire.hpp"
 
 #include <QString>
 
diff --git a/qschematic/wire_system/net.h b/qschematic/wire_system/net.hpp
similarity index 100%
rename from qschematic/wire_system/net.h
rename to qschematic/wire_system/net.hpp
diff --git a/qschematic/wire_system/point.cpp b/qschematic/wire_system/point.cpp
index b914e52f..c51297cc 100644
--- a/qschematic/wire_system/point.cpp
+++ b/qschematic/wire_system/point.cpp
@@ -1,4 +1,4 @@
-#include "point.h"
+#include "point.hpp"
 
 using namespace wire_system;
 
diff --git a/qschematic/wire_system/point.h b/qschematic/wire_system/point.hpp
similarity index 100%
rename from qschematic/wire_system/point.h
rename to qschematic/wire_system/point.hpp
diff --git a/qschematic/wire_system/test/CMakeLists.txt b/qschematic/wire_system/test/CMakeLists.txt
index f21d7c24..6192fc76 100644
--- a/qschematic/wire_system/test/CMakeLists.txt
+++ b/qschematic/wire_system/test/CMakeLists.txt
@@ -6,21 +6,21 @@
 ###
 
 set(WIRESYSTEM_SOURCES
-	../connectable.h
+	../connectable.hpp
 	../line.cpp
-	../line.h
+	../line.hpp
 	../manager.cpp
-	../manager.h
+	../manager.hpp
 	../net.cpp
-	../net.h
+	../net.hpp
 	../point.cpp
-	../point.h
+	../point.hpp
 	../wire.cpp
-	../wire.h
+	../wire.hpp
 	../../utils.cpp
-	../../utils.h
+	../../utils.hpp
 	../../settings.cpp
-	../../settings.h
+	../../settings.hpp
 )
 
 set(TESTS
@@ -39,7 +39,7 @@ target_sources(
 	PRIVATE
 		3rdparty/doctest.h
 		test_main.cpp
-		connector.h
+		connector.hpp
 		${WIRESYSTEM_SOURCES}
 		${TESTS}
 )
diff --git a/qschematic/wire_system/test/connector.h b/qschematic/wire_system/test/connector.hpp
similarity index 85%
rename from qschematic/wire_system/test/connector.h
rename to qschematic/wire_system/test/connector.hpp
index 835aac5d..6fb1c9aa 100644
--- a/qschematic/wire_system/test/connector.h
+++ b/qschematic/wire_system/test/connector.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../connectable.h"
+#include "../connectable.hpp"
 
 #include <QPointF>
 
diff --git a/qschematic/wire_system/test/tests/line.cpp b/qschematic/wire_system/test/tests/line.cpp
index 3cfd4c79..c6521b2c 100644
--- a/qschematic/wire_system/test/tests/line.cpp
+++ b/qschematic/wire_system/test/tests/line.cpp
@@ -1,5 +1,5 @@
 #include "../3rdparty/doctest.h"
-#include "../../line.h"
+#include "../../line.hpp"
 
 TEST_SUITE("Line")
 {
diff --git a/qschematic/wire_system/test/tests/manager.cpp b/qschematic/wire_system/test/tests/manager.cpp
index 269d5748..45008aea 100644
--- a/qschematic/wire_system/test/tests/manager.cpp
+++ b/qschematic/wire_system/test/tests/manager.cpp
@@ -1,7 +1,7 @@
 #include "../3rdparty/doctest.h"
-#include "../connector.h"
-#include "../../manager.h"
-#include "../../wire.h"
+#include "../connector.hpp"
+#include "../../manager.hpp"
+#include "../../wire.hpp"
 
 TEST_SUITE("Manager")
 {
diff --git a/qschematic/wire_system/test/tests/nets.cpp b/qschematic/wire_system/test/tests/nets.cpp
index 5e66c585..a6f468cb 100644
--- a/qschematic/wire_system/test/tests/nets.cpp
+++ b/qschematic/wire_system/test/tests/nets.cpp
@@ -1,7 +1,7 @@
 #include "../3rdparty/doctest.h"
-#include "../../manager.h"
-#include "../../wire.h"
-#include "../../net.h"
+#include "../../manager.hpp"
+#include "../../wire.hpp"
+#include "../../net.hpp"
 
 TEST_SUITE("Net")
 {
diff --git a/qschematic/wire_system/test/tests/wire.cpp b/qschematic/wire_system/test/tests/wire.cpp
index 0aca4826..cc92a75f 100644
--- a/qschematic/wire_system/test/tests/wire.cpp
+++ b/qschematic/wire_system/test/tests/wire.cpp
@@ -1,6 +1,6 @@
 #include "../3rdparty/doctest.h"
-#include "../../manager.h"
-#include "../../wire.h"
+#include "../../manager.hpp"
+#include "../../wire.hpp"
 
 #include <QVector2D>
 
diff --git a/qschematic/wire_system/wire.cpp b/qschematic/wire_system/wire.cpp
index c9f7d6cc..25afc737 100644
--- a/qschematic/wire_system/wire.cpp
+++ b/qschematic/wire_system/wire.cpp
@@ -1,8 +1,8 @@
-#include "wire.h"
-#include "line.h"
-#include "net.h"
-#include "manager.h"
-#include "../utils.h"
+#include "wire.hpp"
+#include "line.hpp"
+#include "net.hpp"
+#include "manager.hpp"
+#include "../utils.hpp"
 
 #include <QVector2D>
 #include <QLineF>
diff --git a/qschematic/wire_system/wire.h b/qschematic/wire_system/wire.hpp
similarity index 99%
rename from qschematic/wire_system/wire.h
rename to qschematic/wire_system/wire.hpp
index 93f629af..6f283c39 100644
--- a/qschematic/wire_system/wire.h
+++ b/qschematic/wire_system/wire.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "point.h"
+#include "point.hpp"
 
 #include <QList>
 #include <QVector>