From 0e91936733548e45aedf3375dbc439d7de8d759f Mon Sep 17 00:00:00 2001
From: Chris Rizzitello <sithlord48@gmail.com>
Date: Sun, 28 Aug 2022 20:42:25 -0400
Subject: [PATCH] Generate at build time alias headers

---
 demos/ff7tkQmlGallery/main.cpp           |  6 +++---
 demos/ff7tkWidgetGallery/mainwindow.cpp  |  6 +++---
 demos/ff7tkWidgetGallery/mainwindow.h    |  2 +-
 src/CMakeLists.txt                       | 24 ++++++++++++++++++++++--
 src/data/CMakeLists.txt                  |  2 +-
 src/data/FF7Achievements.cpp             |  2 +-
 src/data/FF7Achievements.h               |  2 +-
 src/data/FF7Char.cpp                     |  2 +-
 src/data/FF7Char.h                       |  4 ++--
 src/data/FF7FieldItemList.cpp            |  2 +-
 src/data/FF7FieldItemList.h              |  2 +-
 src/data/FF7Item.cpp                     |  2 +-
 src/data/FF7Item.h                       |  2 +-
 src/data/FF7ItemModel.cpp                |  4 ++--
 src/data/FF7ItemModel.h                  |  4 ++--
 src/data/FF7Location.cpp                 |  2 +-
 src/data/FF7Location.h                   |  2 +-
 src/data/FF7Materia.cpp                  |  2 +-
 src/data/FF7Materia.h                    |  4 ++--
 src/data/FF7Save.cpp                     | 10 +++++-----
 src/data/FF7Save.h                       |  6 +++---
 src/data/FF7SaveInfo.cpp                 |  2 +-
 src/data/FF7SaveInfo.h                   |  2 +-
 src/data/FF7Save_Types.h                 |  6 +++---
 src/data/FF7Text.h                       |  2 +-
 src/data/SaveIcon.h                      |  2 +-
 src/data/Type_FF7CHAR.h                  |  4 ++--
 src/data/Type_FF7CHOCOBO.h               |  2 +-
 src/formats/Akao.cpp                     |  2 +-
 src/formats/Akao.h                       |  2 +-
 src/formats/AkaoIO.h                     |  4 ++--
 src/formats/Archive.cpp                  |  2 +-
 src/formats/Archive.h                    |  2 +-
 src/formats/IsoArchive.cpp               |  2 +-
 src/formats/IsoArchive.h                 |  4 ++--
 src/formats/IsoArchiveFF7.cpp            |  6 +++---
 src/formats/IsoArchiveFF7.h              |  4 ++--
 src/formats/Lgp.cpp                      |  6 +++---
 src/formats/Lgp.h                        |  4 ++--
 src/formats/Lgp_p.cpp                    |  2 +-
 src/formats/Lgp_p.h                      |  2 +-
 src/formats/TblFile.cpp                  |  2 +-
 src/formats/TblFile.h                    |  2 +-
 src/formats/TexFile.cpp                  |  4 ++--
 src/formats/TexFile.h                    |  4 ++--
 src/formats/TextureFile.cpp              |  2 +-
 src/formats/TextureFile.h                |  2 +-
 src/formats/TimFile.cpp                  |  4 ++--
 src/formats/TimFile.h                    |  4 ++--
 src/formats/WindowBinFile.cpp            |  4 ++--
 src/formats/WindowBinFile.h              |  4 ++--
 src/utils/GZIP.cpp                       |  2 +-
 src/utils/GZIP.h                         |  2 +-
 src/utils/GZIPPS.cpp                     |  2 +-
 src/utils/GZIPPS.h                       |  4 ++--
 src/utils/IO.cpp                         |  2 +-
 src/utils/IO.h                           |  2 +-
 src/utils/LZS.cpp                        |  2 +-
 src/utils/LZS.h                          |  2 +-
 src/utils/PsColor.cpp                    |  2 +-
 src/utils/PsColor.h                      |  2 +-
 src/utils/PsfFile.cpp                    |  5 ++---
 src/utils/PsfFile.h                      |  2 +-
 src/utils/QLockedFile.cpp                |  2 +-
 src/utils/QLockedFile.h                  |  2 +-
 src/widgets/common/ColorDisplay.cpp      |  2 +-
 src/widgets/common/ColorDisplay.h        |  2 +-
 src/widgets/common/DialogPreview.cpp     |  2 +-
 src/widgets/common/DialogPreview.h       |  2 +-
 src/widgets/common/DoubleCheckBox.cpp    |  2 +-
 src/widgets/common/DoubleCheckBox.h      |  2 +-
 src/widgets/common/HexLineEdit.cpp       |  2 +-
 src/widgets/common/HexLineEdit.h         |  2 +-
 src/widgets/common/QTaskBarButton.cpp    |  2 +-
 src/widgets/common/QTaskBarButton.h      |  2 +-
 src/widgets/data/AchievementEditor.cpp   |  2 +-
 src/widgets/data/AchievementEditor.h     |  4 ++--
 src/widgets/data/CharEditor.cpp          | 10 +++++-----
 src/widgets/data/CharEditor.h            |  4 ++--
 src/widgets/data/ChocoboEditor.cpp       |  2 +-
 src/widgets/data/ChocoboEditor.h         |  4 ++--
 src/widgets/data/ChocoboLabel.cpp        |  2 +-
 src/widgets/data/ChocoboLabel.h          |  2 +-
 src/widgets/data/ChocoboManager.cpp      |  2 +-
 src/widgets/data/ChocoboManager.h        |  6 +++---
 src/widgets/data/ItemList.cpp            |  8 ++++----
 src/widgets/data/ItemList.h              |  2 +-
 src/widgets/data/ItemListView.cpp        | 10 +++++-----
 src/widgets/data/ItemListView.h          |  2 +-
 src/widgets/data/ItemPreview.cpp         |  4 ++--
 src/widgets/data/ItemPreview.h           |  2 +-
 src/widgets/data/ItemSelectionDelegate.h |  2 +-
 src/widgets/data/ItemSelector.cpp        |  4 ++--
 src/widgets/data/ItemSelector.h          |  2 +-
 src/widgets/data/LocationViewer.cpp      |  6 +++---
 src/widgets/data/LocationViewer.h        |  2 +-
 src/widgets/data/MateriaEditor.cpp       |  2 +-
 src/widgets/data/MateriaEditor.h         |  4 ++--
 src/widgets/data/MenuListWidget.cpp      |  2 +-
 src/widgets/data/MenuListWidget.h        |  4 ++--
 src/widgets/data/MetadataCreator.cpp     |  6 +++---
 src/widgets/data/MetadataCreator.h       |  2 +-
 src/widgets/data/OptionsWidget.cpp       |  4 ++--
 src/widgets/data/OptionsWidget.h         |  2 +-
 src/widgets/data/PhsListWidget.cpp       |  4 ++--
 src/widgets/data/PhsListWidget.h         |  4 ++--
 src/widgets/data/SlotPreview.cpp         |  6 ++----
 src/widgets/data/SlotPreview.h           |  2 +-
 src/widgets/data/SlotSelect.cpp          |  8 ++++----
 src/widgets/data/SlotSelect.h            |  2 +-
 110 files changed, 195 insertions(+), 178 deletions(-)

diff --git a/demos/ff7tkQmlGallery/main.cpp b/demos/ff7tkQmlGallery/main.cpp
index aec868597..48e225f95 100644
--- a/demos/ff7tkQmlGallery/main.cpp
+++ b/demos/ff7tkQmlGallery/main.cpp
@@ -18,9 +18,9 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 
-#include <FF7Text.h>
-#include <FF7Item.h>
-#include <ff7tkAbout.h>
+#include <FF7Text>
+#include <FF7Item>
+#include <ff7tkAbout>
 
 int main(int argc, char *argv[])
 {
diff --git a/demos/ff7tkWidgetGallery/mainwindow.cpp b/demos/ff7tkWidgetGallery/mainwindow.cpp
index c95b32b57..4566e6030 100644
--- a/demos/ff7tkWidgetGallery/mainwindow.cpp
+++ b/demos/ff7tkWidgetGallery/mainwindow.cpp
@@ -23,9 +23,9 @@
 #include <QMessageBox>
 #include <QProgressDialog>
 
-#include <FF7Save.h>
-#include <ff7tkAbout.h>
-#include <FF7ItemModel.h>
+#include <FF7Save>
+#include <ff7tkAbout>
+#include <FF7ItemModel>
 
 MainWindow::MainWindow(QWidget *parent): QMainWindow(parent), ui(new Ui::MainWindow)
 {
diff --git a/demos/ff7tkWidgetGallery/mainwindow.h b/demos/ff7tkWidgetGallery/mainwindow.h
index fe1ad89e7..fdb185654 100644
--- a/demos/ff7tkWidgetGallery/mainwindow.h
+++ b/demos/ff7tkWidgetGallery/mainwindow.h
@@ -30,7 +30,7 @@
 #include <AchievementEditor.h>
 #include <ItemListView.h>
 #include <HexLineEdit.h>
-#include <Lgp.h>
+#include <Lgp>
 
 namespace Ui
 {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5fb0842ce..15a46cc67 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,14 +20,30 @@ endif()
 # LIB_TARGET_PrivateLIBLINKS
 macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR)
 
-    add_library (${LIB_TARGET}
-        SHARED
+    add_library (${LIB_TARGET} SHARED
             ${${LIB_TARGET}_SRC}
             ${${LIB_TARGET}_HEADERS}
             ${${LIB_TARGET}_RESOURCES}
     )
     add_library (ff7tk::${LIB_TARGET} ALIAS ${LIB_TARGET})
 
+    #Generate the non .h ending header let the user include "HEADER" or "HEADER.h"
+    foreach ( HEADER ${${LIB_TARGET}_HEADERS})
+        if(${HEADER} MATCHES "^/")
+            string(FIND ${HEADER} "/" lastSlash REVERSE)
+            string(SUBSTRING ${HEADER} 0 ${lastSlash} RMSTRING)
+            string(REPLACE "${RMSTRING}/" "" HEADER ${HEADER})
+        elseif(${HEADER} MATCHES "^([A-Z]):")
+            string(FIND ${HEADER} "/" lastSlash REVERSE)
+            string(SUBSTRING ${HEADER} 0 ${lastSlash} RMSTRING)
+            string(REPLACE "${RMSTRING}/" "" HEADER ${HEADER})
+        endif()
+        set(fileContent "#pragma once\n#include<${HEADER}>\n")
+        string(REPLACE ".h" "" HEADER ${HEADER})
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${HEADER} ${fileContent})
+        list(APPEND ALIASHEADERS ${CMAKE_CURRENT_BINARY_DIR}/${HEADER})
+    endforeach()
+
     if(APPLE)
         set_target_properties(${LIB_TARGET} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
         if(${BUILD_FRAMEWORKS})
@@ -86,6 +102,10 @@ macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR)
         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR}
             COMPONENT ff7tk_headers
     )
+    install (FILES ${ALIASHEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR}
+        COMPONENT ff7tk_headers
+    )
 
     if(UNIX)
         if(NOT APPLE)
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 79fb06d61..9db7cd6a6 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -22,8 +22,8 @@ set (ff7tk_HEADERS
     FF7Achievements.h  FF7Item.h           FF7Save.h      FF7Text.h        Type_FF7CHOCOBO.h
     FF7Char.h          FF7Location.h       FF7SaveInfo.h  SaveIcon.h       Type_materia.h
     FF7ItemModel.h
-    ${CMAKE_CURRENT_BINARY_DIR}/ff7tk_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/ff7tkAbout.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ff7tk_export.h
 )
 
 set ( ff7tk_RESOURCES
diff --git a/src/data/FF7Achievements.cpp b/src/data/FF7Achievements.cpp
index 3e3560f79..cf5f22fea 100644
--- a/src/data/FF7Achievements.cpp
+++ b/src/data/FF7Achievements.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Achievements.h>
+#include <FF7Achievements>
 
 #include <QFile>
 
diff --git a/src/data/FF7Achievements.h b/src/data/FF7Achievements.h
index 5e5711e1c..c5ce700c9 100644
--- a/src/data/FF7Achievements.h
+++ b/src/data/FF7Achievements.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 /*!
  * \class FF7Achievements
diff --git a/src/data/FF7Char.cpp b/src/data/FF7Char.cpp
index 6d2f56df4..fd9388c9a 100644
--- a/src/data/FF7Char.cpp
+++ b/src/data/FF7Char.cpp
@@ -14,7 +14,7 @@
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
 
-#include <FF7Char.h>
+#include <FF7Char>
 
 #include <QIcon>
 #include <QRandomGenerator>
diff --git a/src/data/FF7Char.h b/src/data/FF7Char.h
index d92592868..7cf6b48e9 100644
--- a/src/data/FF7Char.h
+++ b/src/data/FF7Char.h
@@ -17,8 +17,8 @@
 
 #include <QObject>
 #include <QtGlobal>
-#include <ff7tk_export.h>
-#include <Type_FF7CHAR.h>
+#include <ff7tk_export>
+#include <Type_FF7CHAR>
 
 class QIcon;
 class QQmlEngine;
diff --git a/src/data/FF7FieldItemList.cpp b/src/data/FF7FieldItemList.cpp
index dfecf824d..d6f918884 100644
--- a/src/data/FF7FieldItemList.cpp
+++ b/src/data/FF7FieldItemList.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7FieldItemList.h>
+#include <FF7FieldItemList>
 
 #include<QStringList>
 #include <QQmlEngine>
diff --git a/src/data/FF7FieldItemList.h b/src/data/FF7FieldItemList.h
index d106312cb..5cd48791d 100644
--- a/src/data/FF7FieldItemList.h
+++ b/src/data/FF7FieldItemList.h
@@ -17,7 +17,7 @@
 
 #include <QObject>
 #include <QtGlobal>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QQmlEngine;
 class QJSEngine;
diff --git a/src/data/FF7Item.cpp b/src/data/FF7Item.cpp
index 29ef2765a..867244310 100644
--- a/src/data/FF7Item.cpp
+++ b/src/data/FF7Item.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Item.h>
+#include <FF7Item>
 
 #include <QIcon>
 #include <QtEndian>
diff --git a/src/data/FF7Item.h b/src/data/FF7Item.h
index 93c5b6a0b..863044731 100644
--- a/src/data/FF7Item.h
+++ b/src/data/FF7Item.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QIcon;
 class QQmlEngine;
diff --git a/src/data/FF7ItemModel.cpp b/src/data/FF7ItemModel.cpp
index 857f20fbe..459348ad5 100644
--- a/src/data/FF7ItemModel.cpp
+++ b/src/data/FF7ItemModel.cpp
@@ -1,5 +1,5 @@
-#include "FF7ItemModel.h"
-#include <FF7Item.h>
+#include <FF7ItemModel>
+#include <FF7Item>
 #include <QIcon>
 #include <QModelIndex>
 
diff --git a/src/data/FF7ItemModel.h b/src/data/FF7ItemModel.h
index f1fb1688b..ff1f3d543 100644
--- a/src/data/FF7ItemModel.h
+++ b/src/data/FF7ItemModel.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QAbstractTableModel>
-#include <ff7tk_export.h>
-#include <FF7Item.h>
+#include <ff7tk_export>
+#include <FF7Item>
 
 class FF7TK_EXPORT FF7ItemModel : public QAbstractTableModel
 {
diff --git a/src/data/FF7Location.cpp b/src/data/FF7Location.cpp
index 8c9872dce..ff0ac3b47 100644
--- a/src/data/FF7Location.cpp
+++ b/src/data/FF7Location.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Location.h>
+#include <FF7Location>
 
 #include <QQmlEngine>
 
diff --git a/src/data/FF7Location.h b/src/data/FF7Location.h
index 56b02d252..353571fcc 100644
--- a/src/data/FF7Location.h
+++ b/src/data/FF7Location.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QQmlEngine;
 class QJSEngine;
diff --git a/src/data/FF7Materia.cpp b/src/data/FF7Materia.cpp
index 6ea122f1d..89bd07665 100644
--- a/src/data/FF7Materia.cpp
+++ b/src/data/FF7Materia.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Materia.h>
+#include <FF7Materia>
 
 #include <QQmlEngine>
 
diff --git a/src/data/FF7Materia.h b/src/data/FF7Materia.h
index 8f1414bf8..3eb010e05 100644
--- a/src/data/FF7Materia.h
+++ b/src/data/FF7Materia.h
@@ -19,8 +19,8 @@
 #include <QIcon>
 #include <QtEndian>
 
-#include <ff7tk_export.h>
-#include <Type_materia.h>
+#include <ff7tk_export>
+#include <Type_materia>
 
 class QQmlEngine;
 class QJSEngine;
diff --git a/src/data/FF7Save.cpp b/src/data/FF7Save.cpp
index a7ebc8415..28ea64db2 100644
--- a/src/data/FF7Save.cpp
+++ b/src/data/FF7Save.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Save.h>
+#include <FF7Save>
 // This Class should contain NO Gui Parts
 #include <QColor>
 #include <QDateTime>
@@ -26,10 +26,10 @@
 #include <QtXml/QDomDocument>
 #include <QVector>
 #include <QtEndian>
-#include <FF7Text.h>
-#include <FF7Item.h>
-#include <FF7Materia.h>
-#include <FF7Char.h>
+#include <FF7Text>
+#include <FF7Item>
+#include <FF7Materia>
+#include <FF7Char>
 
 // I'm not installing this header.
 #include "crypto/aes.h"
diff --git a/src/data/FF7Save.h b/src/data/FF7Save.h
index 5785aa82a..f0d7cdebd 100644
--- a/src/data/FF7Save.h
+++ b/src/data/FF7Save.h
@@ -17,9 +17,9 @@
 
 #include <QObject>
 #include <cstdlib>
-#include <ff7tk_export.h>
-#include <FF7SaveInfo.h>
-#include <FF7Save_Types.h>
+#include <ff7tk_export>
+#include <FF7SaveInfo>
+#include <FF7Save_Types>
 
 class QColor;
 class QDateTime;
diff --git a/src/data/FF7SaveInfo.cpp b/src/data/FF7SaveInfo.cpp
index f1c0d6f32..2c6d8630c 100644
--- a/src/data/FF7SaveInfo.cpp
+++ b/src/data/FF7SaveInfo.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7SaveInfo.h>
+#include <FF7SaveInfo>
 
 #include <QByteArrayList>
 #include <QQmlEngine>
diff --git a/src/data/FF7SaveInfo.h b/src/data/FF7SaveInfo.h
index b8eeb4791..bc1d6ede7 100644
--- a/src/data/FF7SaveInfo.h
+++ b/src/data/FF7SaveInfo.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
 #include <QRegularExpression>
+#include <ff7tk_export>
 
 class QJSEngine;
 class QQmlEngine;
diff --git a/src/data/FF7Save_Types.h b/src/data/FF7Save_Types.h
index 4322c091a..0ee1b6324 100644
--- a/src/data/FF7Save_Types.h
+++ b/src/data/FF7Save_Types.h
@@ -28,9 +28,9 @@
 #endif
 
 #include <QVector>
-#include <ff7tk_export.h>
-#include <Type_FF7CHAR.h>
-#include <Type_FF7CHOCOBO.h>
+#include <ff7tk_export>
+#include <Type_FF7CHAR>
+#include <Type_FF7CHOCOBO>
 //Materia Type is included as part of FF7Char
 /*~~~~~~~~~~~~~~~~~~~~~~~~STRUCT TYPES AND SAVE STRUCT~~~~~~~~~~~~~~~~*/
 PACK(
diff --git a/src/data/FF7Text.h b/src/data/FF7Text.h
index 8cbeac057..28119fec5 100644
--- a/src/data/FF7Text.h
+++ b/src/data/FF7Text.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QQmlEngine;
 class QJSEngine;
diff --git a/src/data/SaveIcon.h b/src/data/SaveIcon.h
index 290f747d0..59593b07e 100755
--- a/src/data/SaveIcon.h
+++ b/src/data/SaveIcon.h
@@ -18,7 +18,7 @@
 
 #include <QObject>
 #include <QPixmap>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 /** \class SaveIcon
  *  \brief PSX icon data as a QPixmap
diff --git a/src/data/Type_FF7CHAR.h b/src/data/Type_FF7CHAR.h
index 5149ee9a0..95373284d 100644
--- a/src/data/Type_FF7CHAR.h
+++ b/src/data/Type_FF7CHAR.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QtCore/qglobal.h>
-#include <Type_materia.h>
-#include <ff7tk_export.h>
+#include <Type_materia>
+#include <ff7tk_export>
 
 /*! \struct FF7CHAR
  * \brief  Character Info in the save game.
diff --git a/src/data/Type_FF7CHOCOBO.h b/src/data/Type_FF7CHOCOBO.h
index 2941fc9cb..2f5b86b07 100644
--- a/src/data/Type_FF7CHOCOBO.h
+++ b/src/data/Type_FF7CHOCOBO.h
@@ -15,7 +15,7 @@
 /****************************************************************************/
 #pragma once
 #include <QtCore/qglobal.h>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 #ifdef _MSC_VER
 #   define PACK(structure)          \
diff --git a/src/formats/Akao.cpp b/src/formats/Akao.cpp
index 77575bc05..765c68acd 100644
--- a/src/formats/Akao.cpp
+++ b/src/formats/Akao.cpp
@@ -13,6 +13,6 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <Akao.h>
+#include <Akao>
 
 Akao::Akao() { }
diff --git a/src/formats/Akao.h b/src/formats/Akao.h
index 5c21ce396..cc353c5f0 100644
--- a/src/formats/Akao.h
+++ b/src/formats/Akao.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QtCore>
-#include <ff7tkformats_export.h>
+#include <ff7tkformats_export>
 
 class FF7TKFORMATS_EXPORT Akao
 {
diff --git a/src/formats/AkaoIO.h b/src/formats/AkaoIO.h
index c996f0353..2f7512cab 100644
--- a/src/formats/AkaoIO.h
+++ b/src/formats/AkaoIO.h
@@ -15,8 +15,8 @@
 /****************************************************************************/
 #pragma once
 
-#include <IO.h>
-#include <Akao.h>
+#include <IO>
+#include <Akao>
 
 class AkaoIO : public IO
 {
diff --git a/src/formats/Archive.cpp b/src/formats/Archive.cpp
index 214682fc8..afa8d4a59 100644
--- a/src/formats/Archive.cpp
+++ b/src/formats/Archive.cpp
@@ -14,7 +14,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <Archive.h>
+#include <Archive>
 
 ArchiveObserver::~ArchiveObserver()
 {
diff --git a/src/formats/Archive.h b/src/formats/Archive.h
index 4340e2467..81f564b5b 100644
--- a/src/formats/Archive.h
+++ b/src/formats/Archive.h
@@ -20,7 +20,7 @@
 #include <QByteArray>
 #include <QFile>
 #include <QDebug>
-#include <ff7tkformats_export.h>
+#include <ff7tkformats_export>
 
 struct FF7TKFORMATS_EXPORT ArchiveObserver {
     ArchiveObserver() {}
diff --git a/src/formats/IsoArchive.cpp b/src/formats/IsoArchive.cpp
index c4fa43367..00e301ab3 100644
--- a/src/formats/IsoArchive.cpp
+++ b/src/formats/IsoArchive.cpp
@@ -14,7 +14,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <IsoArchive.h>
+#include <IsoArchive>
 #include <QCoreApplication>
 #include <QDir>
 #include <QtEndian>
diff --git a/src/formats/IsoArchive.h b/src/formats/IsoArchive.h
index 94c21f42d..a7dc3cbde 100644
--- a/src/formats/IsoArchive.h
+++ b/src/formats/IsoArchive.h
@@ -18,8 +18,8 @@
 
 #include <QIODevice>
 #include <QString>
-#include <Archive.h>
-#include <ff7tkformats_export.h>
+#include <Archive>
+#include <ff7tkformats_export>
 
 #define MAX_ISO_READ            10000
 #define MAX_FILENAME_LENGTH     207
diff --git a/src/formats/IsoArchiveFF7.cpp b/src/formats/IsoArchiveFF7.cpp
index 5b845ce5b..5b686e219 100644
--- a/src/formats/IsoArchiveFF7.cpp
+++ b/src/formats/IsoArchiveFF7.cpp
@@ -13,9 +13,9 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <LZS.h>
-#include <GZIPPS.h>
-#include <IsoArchiveFF7.h>
+#include <LZS>
+#include <GZIPPS>
+#include <IsoArchiveFF7>
 
 IsoArchiveFF7::IsoArchiveFF7(const QString &name)
     : IsoArchive(name)
diff --git a/src/formats/IsoArchiveFF7.h b/src/formats/IsoArchiveFF7.h
index 142cb9769..250b2c320 100644
--- a/src/formats/IsoArchiveFF7.h
+++ b/src/formats/IsoArchiveFF7.h
@@ -15,8 +15,8 @@
 /****************************************************************************/
 #pragma once
 
-#include <IsoArchive.h>
-#include <ff7tkformats_export.h>
+#include <IsoArchive>
+#include <ff7tkformats_export>
 
 class FF7TKFORMATS_EXPORT IsoArchiveFF7 : public IsoArchive
 {
diff --git a/src/formats/Lgp.cpp b/src/formats/Lgp.cpp
index 3fb2a645e..7600dbd46 100644
--- a/src/formats/Lgp.cpp
+++ b/src/formats/Lgp.cpp
@@ -19,9 +19,9 @@
  * inspired from LGP/UnLGP tool written by Aali.
  * http://forums.qhimm.com/index.php?topic=8641.0
  */
-#include <Lgp.h>
-#include <Lgp_p.h>
-#include <QLockedFile.h>
+#include <Lgp>
+#include <Lgp_p>
+#include <QLockedFile>
 
 /*!
  * You must use Lgp::iterator() instead.
diff --git a/src/formats/Lgp.h b/src/formats/Lgp.h
index d69f71671..14928594a 100644
--- a/src/formats/Lgp.h
+++ b/src/formats/Lgp.h
@@ -21,8 +21,8 @@
  */
 #pragma once
 
-#include <Archive.h>
-#include <ff7tkformats_export.h>
+#include <Archive>
+#include <ff7tkformats_export>
 
 class LgpHeaderEntry;
 class LgpToc;
diff --git a/src/formats/Lgp_p.cpp b/src/formats/Lgp_p.cpp
index 921ea2214..72b1d204a 100644
--- a/src/formats/Lgp_p.cpp
+++ b/src/formats/Lgp_p.cpp
@@ -19,7 +19,7 @@
  * inspired from LGP/UnLGP tool written by Aali.
  * http://forums.qhimm.com/index.php?topic=8641.0
  */
-#include <Lgp_p.h>
+#include <Lgp_p>
 #include <QDebug>
 
 LgpHeaderEntry::LgpHeaderEntry(const QString &fileName, quint32 filePosition) :
diff --git a/src/formats/Lgp_p.h b/src/formats/Lgp_p.h
index e1373646c..d55ccb177 100644
--- a/src/formats/Lgp_p.h
+++ b/src/formats/Lgp_p.h
@@ -25,7 +25,7 @@
 #include <QString>
 #include <QMultiHash>
 
-#include <ff7tkformats_export.h>
+#include <ff7tkformats_export>
 
 #define LGP_COMPANY_NAME_SIZE    12
 #define LGP_PRODUCT_NAME_SIZE    14
diff --git a/src/formats/TblFile.cpp b/src/formats/TblFile.cpp
index e3c2b93b7..65c31e961 100644
--- a/src/formats/TblFile.cpp
+++ b/src/formats/TblFile.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <TblFile.h>
+#include <TblFile>
 
 TblFile::TblFile()
 {
diff --git a/src/formats/TblFile.h b/src/formats/TblFile.h
index 177c26f40..22797ce21 100644
--- a/src/formats/TblFile.h
+++ b/src/formats/TblFile.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QtCore>
-#include <ff7tkformats_export.h>
+#include <ff7tkformats_export>
 
 struct FF7TKFORMATS_EXPORT WorldToField
 {
diff --git a/src/formats/TexFile.cpp b/src/formats/TexFile.cpp
index a25173e97..41afe0702 100644
--- a/src/formats/TexFile.cpp
+++ b/src/formats/TexFile.cpp
@@ -13,8 +13,8 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <TexFile.h>
-#include <PsColor.h>
+#include <TexFile>
+#include <PsColor>
 
 TexFile::TexFile(const QByteArray &data)
     : TextureFile()
diff --git a/src/formats/TexFile.h b/src/formats/TexFile.h
index 3eb2b788d..e800f1806 100644
--- a/src/formats/TexFile.h
+++ b/src/formats/TexFile.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QImage>
-#include <TextureFile.h>
-#include <ff7tkformats_export.h>
+#include <TextureFile>
+#include <ff7tkformats_export>
 
 struct FF7TKFORMATS_EXPORT TexStruct {
     // Header
diff --git a/src/formats/TextureFile.cpp b/src/formats/TextureFile.cpp
index 1073338b2..ad3ce3286 100644
--- a/src/formats/TextureFile.cpp
+++ b/src/formats/TextureFile.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <TextureFile.h>
+#include <TextureFile>
 
 TextureFile::TextureFile() :
     _currentColorTable(0)
diff --git a/src/formats/TextureFile.h b/src/formats/TextureFile.h
index 0a5cbd3b0..e840b5331 100644
--- a/src/formats/TextureFile.h
+++ b/src/formats/TextureFile.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QImage>
-#include <ff7tkformats_export.h>
+#include <ff7tkformats_export>
 
 class FF7TKFORMATS_EXPORT TextureFile
 {
diff --git a/src/formats/TimFile.cpp b/src/formats/TimFile.cpp
index 408ac15b5..bb881d196 100644
--- a/src/formats/TimFile.cpp
+++ b/src/formats/TimFile.cpp
@@ -13,8 +13,8 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <TimFile.h>
-#include <PsColor.h>
+#include <TimFile>
+#include <PsColor>
 
 TimFile::TimFile(const QByteArray &data)
     : TextureFile()
diff --git a/src/formats/TimFile.h b/src/formats/TimFile.h
index 05dc43db5..900b16607 100644
--- a/src/formats/TimFile.h
+++ b/src/formats/TimFile.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QImage>
-#include <TextureFile.h>
-#include <ff7tkformats_export.h>
+#include <TextureFile>
+#include <ff7tkformats_export>
 
 class FF7TKFORMATS_EXPORT TimFile : public TextureFile
 {
diff --git a/src/formats/WindowBinFile.cpp b/src/formats/WindowBinFile.cpp
index 1d2a8f301..18abd02d4 100644
--- a/src/formats/WindowBinFile.cpp
+++ b/src/formats/WindowBinFile.cpp
@@ -13,8 +13,8 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <WindowBinFile.h>
-#include <GZIP.h>
+#include <WindowBinFile>
+#include <GZIP>
 
 WindowBinFile::WindowBinFile()
     : modified(false)
diff --git a/src/formats/WindowBinFile.h b/src/formats/WindowBinFile.h
index 403ac1ab8..ab78a6de1 100644
--- a/src/formats/WindowBinFile.h
+++ b/src/formats/WindowBinFile.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QtCore>
-#include <TimFile.h>
-#include <ff7tkformats_export.h>
+#include <TimFile>
+#include <ff7tkformats_export>
 
 inline quint8 LEFT_PADD(quint8 w) {return (w >> 5);}
 inline quint8 CHARACTER_WIDTH(quint8 w) {return(w & 0x1F);}
diff --git a/src/utils/GZIP.cpp b/src/utils/GZIP.cpp
index 08e2e1d5a..0839204e7 100644
--- a/src/utils/GZIP.cpp
+++ b/src/utils/GZIP.cpp
@@ -13,7 +13,7 @@
 //   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <GZIP.h>
+#include <GZIP>
 #include <zlib.h>
 #undef compress // conflict with GZIP::compress
 
diff --git a/src/utils/GZIP.h b/src/utils/GZIP.h
index 2051ad9c4..71d8dfe0c 100644
--- a/src/utils/GZIP.h
+++ b/src/utils/GZIP.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QtCore>
-#include <ff7tkutils_export.h>
+#include <ff7tkutils_export>
 
 class FF7TKUTILS_EXPORT GZIP
 {
diff --git a/src/utils/GZIPPS.cpp b/src/utils/GZIPPS.cpp
index c1b2b8d11..2395818f7 100644
--- a/src/utils/GZIPPS.cpp
+++ b/src/utils/GZIPPS.cpp
@@ -13,7 +13,7 @@
 //   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <GZIPPS.h>
+#include <GZIPPS>
 
 QByteArray GZIPPS::decompress(const char *data, int size)
 {
diff --git a/src/utils/GZIPPS.h b/src/utils/GZIPPS.h
index 7df17fe7b..e5d2e9cd2 100644
--- a/src/utils/GZIPPS.h
+++ b/src/utils/GZIPPS.h
@@ -15,8 +15,8 @@
 /****************************************************************************/
 #pragma once
 
-#include <GZIP.h>
-#include <ff7tkutils_export.h>
+#include <GZIP>
+#include <ff7tkutils_export>
 
 #define GZIPPS_HEADER_SIZE      8
 
diff --git a/src/utils/IO.cpp b/src/utils/IO.cpp
index 606091c3d..7e195de33 100644
--- a/src/utils/IO.cpp
+++ b/src/utils/IO.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <IO.h>
+#include <IO>
 
 IO::IO(QIODevice *device)
     : _device(device)
diff --git a/src/utils/IO.h b/src/utils/IO.h
index 168562829..dfc0ad91c 100644
--- a/src/utils/IO.h
+++ b/src/utils/IO.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QtCore>
-#include <ff7tkutils_export.h>
+#include <ff7tkutils_export>
 
 class FF7TKUTILS_EXPORT IO
 {
diff --git a/src/utils/LZS.cpp b/src/utils/LZS.cpp
index 3aada11aa..a047280a4 100644
--- a/src/utils/LZS.cpp
+++ b/src/utils/LZS.cpp
@@ -21,7 +21,7 @@
         NIFTY-Serve PAF01022
         CompuServe  74050,1022
 **************************************************************/
-#include <LZS.h>
+#include <LZS>
 
 qint32 LZS::match_length = 0; // of longest match. These are set by the InsertNode() procedure.
 qint32 LZS::match_position = 0;
diff --git a/src/utils/LZS.h b/src/utils/LZS.h
index 05f14466a..cb29d71bf 100644
--- a/src/utils/LZS.h
+++ b/src/utils/LZS.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <QtCore>
-#include <ff7tkutils_export.h>
+#include <ff7tkutils_export>
 
 class FF7TKUTILS_EXPORT LZS
 {
diff --git a/src/utils/PsColor.cpp b/src/utils/PsColor.cpp
index 5b4253a70..8782a96b9 100644
--- a/src/utils/PsColor.cpp
+++ b/src/utils/PsColor.cpp
@@ -13,7 +13,7 @@
 //   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <PsColor.h>
+#include <PsColor>
 
 quint16 PsColor::toPsColor(const QRgb &color)
 {
diff --git a/src/utils/PsColor.h b/src/utils/PsColor.h
index bdd3be3a3..4e4648625 100644
--- a/src/utils/PsColor.h
+++ b/src/utils/PsColor.h
@@ -17,7 +17,7 @@
 
 #include <QtCore>
 #include <QRgb>
-#include <ff7tkutils_export.h>
+#include <ff7tkutils_export>
 
 #define COEFF_COLOR    8.2258064516129032258064516129032 // 255/31
 
diff --git a/src/utils/PsfFile.cpp b/src/utils/PsfFile.cpp
index 242ac98ff..78197e418 100644
--- a/src/utils/PsfFile.cpp
+++ b/src/utils/PsfFile.cpp
@@ -13,9 +13,8 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <PsfFile.h>
-
-#include <GZIP.h>
+#include <PsfFile>
+#include <GZIP>
 
 PsfTags::PsfTags()
 {
diff --git a/src/utils/PsfFile.h b/src/utils/PsfFile.h
index 078e0e16c..6850d4c83 100644
--- a/src/utils/PsfFile.h
+++ b/src/utils/PsfFile.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QtCore>
-#include <ff7tkutils_export.h>
+#include <ff7tkutils_export>
 
 class FF7TKUTILS_EXPORT PsfTags
 {
diff --git a/src/utils/QLockedFile.cpp b/src/utils/QLockedFile.cpp
index 2ca27f349..3cd3a3bda 100644
--- a/src/utils/QLockedFile.cpp
+++ b/src/utils/QLockedFile.cpp
@@ -13,7 +13,7 @@
 //   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <QLockedFile.h>
+#include <QLockedFile>
 
 QLockedFile::QLockedFile()
 {
diff --git a/src/utils/QLockedFile.h b/src/utils/QLockedFile.h
index 4f258747b..c6a547ef0 100644
--- a/src/utils/QLockedFile.h
+++ b/src/utils/QLockedFile.h
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #endif
-#include <ff7tkutils_export.h>
+#include <ff7tkutils_export>
 
 class FF7TKUTILS_EXPORT QLockedFile : public QFile
 {
diff --git a/src/widgets/common/ColorDisplay.cpp b/src/widgets/common/ColorDisplay.cpp
index 0186c2e38..34b31aae8 100644
--- a/src/widgets/common/ColorDisplay.cpp
+++ b/src/widgets/common/ColorDisplay.cpp
@@ -15,7 +15,7 @@
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
 /****************************************************************************/
-#include <ColorDisplay.h>
+#include <ColorDisplay>
 
 #include <QColorDialog>
 #include <QMouseEvent>
diff --git a/src/widgets/common/ColorDisplay.h b/src/widgets/common/ColorDisplay.h
index 5a63b4b03..997a6ba06 100644
--- a/src/widgets/common/ColorDisplay.h
+++ b/src/widgets/common/ColorDisplay.h
@@ -18,7 +18,7 @@
 
 
 #include <QWidget>
-#include <ff7tkqtwidgets_export.h>
+#include <ff7tkqtwidgets_export>
 
 #define COLOR_DISPLAY_MIN_CELL_SIZE   9
 #define COLOR_DISPLAY_BORDER_WIDTH    1
diff --git a/src/widgets/common/DialogPreview.cpp b/src/widgets/common/DialogPreview.cpp
index dc96fb4d3..896f76c66 100644
--- a/src/widgets/common/DialogPreview.cpp
+++ b/src/widgets/common/DialogPreview.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <DialogPreview.h>
+#include <DialogPreview>
 
 #include <QColorDialog>
 #include <QMouseEvent>
diff --git a/src/widgets/common/DialogPreview.h b/src/widgets/common/DialogPreview.h
index dab81d7cc..ab74e5f90 100644
--- a/src/widgets/common/DialogPreview.h
+++ b/src/widgets/common/DialogPreview.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QLabel>
-#include <ff7tkqtwidgets_export.h>
+#include <ff7tkqtwidgets_export>
 
 class FF7TKQTWIDGETS_EXPORT DialogPreview : public QLabel
 {
diff --git a/src/widgets/common/DoubleCheckBox.cpp b/src/widgets/common/DoubleCheckBox.cpp
index 8e11cd50e..f70793fc6 100644
--- a/src/widgets/common/DoubleCheckBox.cpp
+++ b/src/widgets/common/DoubleCheckBox.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <DoubleCheckBox.h>
+#include <DoubleCheckBox>
 
 #include <QCheckBox>
 #include <QHBoxLayout>
diff --git a/src/widgets/common/DoubleCheckBox.h b/src/widgets/common/DoubleCheckBox.h
index 7efda1f36..68fd48faa 100644
--- a/src/widgets/common/DoubleCheckBox.h
+++ b/src/widgets/common/DoubleCheckBox.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkqtwidgets_export.h>
+#include <ff7tkqtwidgets_export>
 
 class QCheckBox;
 class QLabel;
diff --git a/src/widgets/common/HexLineEdit.cpp b/src/widgets/common/HexLineEdit.cpp
index 570f17ba8..44acad655 100644
--- a/src/widgets/common/HexLineEdit.cpp
+++ b/src/widgets/common/HexLineEdit.cpp
@@ -14,7 +14,7 @@
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
 /****************************************************************************/
-#include <HexLineEdit.h>
+#include <HexLineEdit>
 #include <QRegularExpressionValidator>
 
 HexLineEdit::HexLineEdit(QWidget *parent)
diff --git a/src/widgets/common/HexLineEdit.h b/src/widgets/common/HexLineEdit.h
index cc0f4911e..473120ab6 100644
--- a/src/widgets/common/HexLineEdit.h
+++ b/src/widgets/common/HexLineEdit.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <QLineEdit>
-#include <ff7tkqtwidgets_export.h>
+#include <ff7tkqtwidgets_export>
 
 class FF7TKQTWIDGETS_EXPORT HexLineEdit : public QLineEdit
 {
diff --git a/src/widgets/common/QTaskBarButton.cpp b/src/widgets/common/QTaskBarButton.cpp
index 582714e6e..636bc1007 100644
--- a/src/widgets/common/QTaskBarButton.cpp
+++ b/src/widgets/common/QTaskBarButton.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <QTaskBarButton.h>
+#include <QTaskBarButton>
 
 #ifdef QTASKBAR_WIN
 QTaskBarButton::QTaskBarButton(QObject *parent)
diff --git a/src/widgets/common/QTaskBarButton.h b/src/widgets/common/QTaskBarButton.h
index 76568104b..7e473595e 100644
--- a/src/widgets/common/QTaskBarButton.h
+++ b/src/widgets/common/QTaskBarButton.h
@@ -17,7 +17,7 @@
 
 #include <QObject>
 #include <QImage>
-#include <ff7tkqtwidgets_export.h>
+#include <ff7tkqtwidgets_export>
 
 #if defined(Q_OS_WIN)
     #include <shobjidl.h>
diff --git a/src/widgets/data/AchievementEditor.cpp b/src/widgets/data/AchievementEditor.cpp
index 8a124a07d..5691cb261 100644
--- a/src/widgets/data/AchievementEditor.cpp
+++ b/src/widgets/data/AchievementEditor.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <AchievementEditor.h>
+#include <AchievementEditor>
 
 #include <QGridLayout>
 #include <QListWidget>
diff --git a/src/widgets/data/AchievementEditor.h b/src/widgets/data/AchievementEditor.h
index c508c3956..5b4d3d648 100644
--- a/src/widgets/data/AchievementEditor.h
+++ b/src/widgets/data/AchievementEditor.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
-#include <FF7Achievements.h>
+#include <ff7tkwidgets_export>
+#include <FF7Achievements>
 
 class QListWidget;
 
diff --git a/src/widgets/data/CharEditor.cpp b/src/widgets/data/CharEditor.cpp
index 4a5333c2f..476409854 100644
--- a/src/widgets/data/CharEditor.cpp
+++ b/src/widgets/data/CharEditor.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <CharEditor.h>
+#include <CharEditor>
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -31,10 +31,10 @@
 #include <QToolBox>
 #include <QVBoxLayout>
 
-#include <FF7Char.h>
-#include <FF7Item.h>
-#include <FF7Materia.h>
-#include <MateriaEditor.h>
+#include <FF7Char>
+#include <FF7Item>
+#include <FF7Materia>
+#include <MateriaEditor>
 
 CharEditor::CharEditor(QWidget *parent)
     : QWidget(parent)
diff --git a/src/widgets/data/CharEditor.h b/src/widgets/data/CharEditor.h
index f3b58fcd4..b73636528 100644
--- a/src/widgets/data/CharEditor.h
+++ b/src/widgets/data/CharEditor.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
-#include <Type_FF7CHAR.h>
+#include <ff7tkwidgets_export>
+#include <Type_FF7CHAR>
 
 class QCheckBox;
 class QComboBox;
diff --git a/src/widgets/data/ChocoboEditor.cpp b/src/widgets/data/ChocoboEditor.cpp
index 11274559a..4e82f711a 100644
--- a/src/widgets/data/ChocoboEditor.cpp
+++ b/src/widgets/data/ChocoboEditor.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <ChocoboEditor.h>
+#include <ChocoboEditor>
 
 #include <QCheckBox>
 #include <QComboBox>
diff --git a/src/widgets/data/ChocoboEditor.h b/src/widgets/data/ChocoboEditor.h
index e0ee24987..bb87d35fc 100644
--- a/src/widgets/data/ChocoboEditor.h
+++ b/src/widgets/data/ChocoboEditor.h
@@ -17,8 +17,8 @@
 
 #include <QWidget>
 #include <QEvent>
-#include <ff7tkwidgets_export.h>
-#include <Type_FF7CHOCOBO.h>
+#include <ff7tkwidgets_export>
+#include <Type_FF7CHOCOBO>
 
 class QCheckBox;
 class QComboBox;
diff --git a/src/widgets/data/ChocoboLabel.cpp b/src/widgets/data/ChocoboLabel.cpp
index 7891f953a..8c3cb6721 100644
--- a/src/widgets/data/ChocoboLabel.cpp
+++ b/src/widgets/data/ChocoboLabel.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <ChocoboLabel.h>
+#include <ChocoboLabel>
 
 #include <QCheckBox>
 #include <QHBoxLayout>
diff --git a/src/widgets/data/ChocoboLabel.h b/src/widgets/data/ChocoboLabel.h
index d799269eb..2db09cdd6 100644
--- a/src/widgets/data/ChocoboLabel.h
+++ b/src/widgets/data/ChocoboLabel.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class QCheckBox;
 class QFrame;
diff --git a/src/widgets/data/ChocoboManager.cpp b/src/widgets/data/ChocoboManager.cpp
index 953e49fc1..c67dcae43 100644
--- a/src/widgets/data/ChocoboManager.cpp
+++ b/src/widgets/data/ChocoboManager.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <ChocoboManager.h>
+#include <ChocoboManager>
 
 #include <QComboBox>
 #include <QGroupBox>
diff --git a/src/widgets/data/ChocoboManager.h b/src/widgets/data/ChocoboManager.h
index 8c3242036..73844f875 100644
--- a/src/widgets/data/ChocoboManager.h
+++ b/src/widgets/data/ChocoboManager.h
@@ -16,9 +16,9 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
-#include <ChocoboEditor.h>
-#include <ChocoboLabel.h>
+#include <ff7tkwidgets_export>
+#include <ChocoboEditor>
+#include <ChocoboLabel>
 
 class QComboBox;
 class QGroupBox;
diff --git a/src/widgets/data/ItemList.cpp b/src/widgets/data/ItemList.cpp
index 2a55237f6..c45606def 100644
--- a/src/widgets/data/ItemList.cpp
+++ b/src/widgets/data/ItemList.cpp
@@ -13,14 +13,14 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <ItemList.h>
+#include <ItemList>
 
 #include <QHeaderView>
 #include <QScrollBar>
 
-#include <FF7Item.h>
-#include <ItemPreview.h>
-#include <ItemSelector.h>
+#include <FF7Item>
+#include <ItemPreview>
+#include <ItemSelector>
 
 bool ItemList::eventFilter(QObject *obj, QEvent *ev)
 {
diff --git a/src/widgets/data/ItemList.h b/src/widgets/data/ItemList.h
index 7b96d8d0e..3b87cec92 100644
--- a/src/widgets/data/ItemList.h
+++ b/src/widgets/data/ItemList.h
@@ -17,7 +17,7 @@
 
 #include <QTableWidget>
 #include <QEvent>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class ItemPreview;
 class ItemSelector;
diff --git a/src/widgets/data/ItemListView.cpp b/src/widgets/data/ItemListView.cpp
index b87c96297..cb9e5b724 100644
--- a/src/widgets/data/ItemListView.cpp
+++ b/src/widgets/data/ItemListView.cpp
@@ -13,15 +13,15 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <ItemListView.h>
+#include <ItemListView>
 
 #include <QEvent>
 #include <QHeaderView>
 #include <QScrollBar>
-#include <FF7Item.h>
-#include <ItemPreview.h>
-#include <ItemSelector.h>
-#include <ItemSelectionDelegate.h>
+#include <FF7Item>
+#include <ItemPreview>
+#include <ItemSelector>
+#include <ItemSelectionDelegate>
 
 ItemListView::ItemListView(QWidget *parent)
     : QTableView(parent)
diff --git a/src/widgets/data/ItemListView.h b/src/widgets/data/ItemListView.h
index 79a69aef3..e93a20119 100644
--- a/src/widgets/data/ItemListView.h
+++ b/src/widgets/data/ItemListView.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QTableView>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class ItemPreview;
 
diff --git a/src/widgets/data/ItemPreview.cpp b/src/widgets/data/ItemPreview.cpp
index 89be9f38a..122cce39c 100644
--- a/src/widgets/data/ItemPreview.cpp
+++ b/src/widgets/data/ItemPreview.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <ItemPreview.h>
+#include <ItemPreview>
 
 #include <QEvent>
 #include <QGroupBox>
@@ -22,7 +22,7 @@
 #include <QListWidget>
 #include <QtEndian>
 
-#include <FF7Item.h>
+#include <FF7Item>
 
 bool ItemPreview::eventFilter(QObject *obj, QEvent *ev)
 {
diff --git a/src/widgets/data/ItemPreview.h b/src/widgets/data/ItemPreview.h
index 2d3bdc089..21ed4ba5e 100644
--- a/src/widgets/data/ItemPreview.h
+++ b/src/widgets/data/ItemPreview.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class QGroupBox;
 class QHBoxLayout;
diff --git a/src/widgets/data/ItemSelectionDelegate.h b/src/widgets/data/ItemSelectionDelegate.h
index e1d3f9a13..e8ad07e09 100644
--- a/src/widgets/data/ItemSelectionDelegate.h
+++ b/src/widgets/data/ItemSelectionDelegate.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QStyledItemDelegate>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class FF7TKWIDGETS_EXPORT ItemSelectionDelegate : public QStyledItemDelegate
 {
diff --git a/src/widgets/data/ItemSelector.cpp b/src/widgets/data/ItemSelector.cpp
index f9aef57f6..86e60df4f 100644
--- a/src/widgets/data/ItemSelector.cpp
+++ b/src/widgets/data/ItemSelector.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <ItemSelector.h>
+#include <ItemSelector>
 
 #include <QComboBox>
 #include <QAbstractItemView>
@@ -21,7 +21,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 
-#include <FF7Item.h>
+#include <FF7Item>
 
 ItemSelector::ItemSelector(QWidget *parent)
     : QWidget(parent)
diff --git a/src/widgets/data/ItemSelector.h b/src/widgets/data/ItemSelector.h
index 565b87a13..f4755ed9b 100644
--- a/src/widgets/data/ItemSelector.h
+++ b/src/widgets/data/ItemSelector.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class QComboBox;
 class QPushButton;
diff --git a/src/widgets/data/LocationViewer.cpp b/src/widgets/data/LocationViewer.cpp
index c9a4666af..b675538b3 100644
--- a/src/widgets/data/LocationViewer.cpp
+++ b/src/widgets/data/LocationViewer.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the          //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <LocationViewer.h>
+#include <LocationViewer>
 
 #include <QAction>
 #include <QCheckBox>
@@ -35,8 +35,8 @@
 #include <QDir>
 #include <QCoreApplication>
 
-#include <FF7Location.h>
-#include <FF7FieldItemList.h>
+#include <FF7Location>
+#include <FF7FieldItemList>
 
 LocationViewer::LocationViewer(QWidget *parent)
     : QWidget(parent)
diff --git a/src/widgets/data/LocationViewer.h b/src/widgets/data/LocationViewer.h
index d33d4ddc6..5e8b4aea8 100644
--- a/src/widgets/data/LocationViewer.h
+++ b/src/widgets/data/LocationViewer.h
@@ -18,7 +18,7 @@
 #include <QEvent>
 #include <QModelIndex>
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class QAction;
 class QCheckBox;
diff --git a/src/widgets/data/MateriaEditor.cpp b/src/widgets/data/MateriaEditor.cpp
index 029e9b6b4..4616f78b0 100644
--- a/src/widgets/data/MateriaEditor.cpp
+++ b/src/widgets/data/MateriaEditor.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the          //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <MateriaEditor.h>
+#include <MateriaEditor>
 
 #include <QComboBox>
 #include <QGroupBox>
diff --git a/src/widgets/data/MateriaEditor.h b/src/widgets/data/MateriaEditor.h
index 40a43da41..fc03ddfce 100644
--- a/src/widgets/data/MateriaEditor.h
+++ b/src/widgets/data/MateriaEditor.h
@@ -17,8 +17,8 @@
 
 #include <QWidget>
 #include <QEvent>
-#include <ff7tkwidgets_export.h>
-#include <FF7Materia.h>
+#include <ff7tkwidgets_export>
+#include <FF7Materia>
 
 class QComboBox;
 class QFrame;
diff --git a/src/widgets/data/MenuListWidget.cpp b/src/widgets/data/MenuListWidget.cpp
index f0649a1df..2de5c2877 100644
--- a/src/widgets/data/MenuListWidget.cpp
+++ b/src/widgets/data/MenuListWidget.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <MenuListWidget.h>
+#include <MenuListWidget>
 
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/src/widgets/data/MenuListWidget.h b/src/widgets/data/MenuListWidget.h
index 9e76c75f4..ae861505f 100644
--- a/src/widgets/data/MenuListWidget.h
+++ b/src/widgets/data/MenuListWidget.h
@@ -17,8 +17,8 @@
 
 #include <QWidget>
 #include <QEvent>
-#include <ff7tkwidgets_export.h>
-#include <DoubleCheckBox.h>
+#include <ff7tkwidgets_export>
+#include <DoubleCheckBox>
 
 /** \class MenuListWidget
  *  \brief easily manage the menus in Final Fantasy 7
diff --git a/src/widgets/data/MetadataCreator.cpp b/src/widgets/data/MetadataCreator.cpp
index 4d0cc5825..f2035b0ee 100644
--- a/src/widgets/data/MetadataCreator.cpp
+++ b/src/widgets/data/MetadataCreator.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <MetadataCreator.h>
+#include <MetadataCreator>
 
 #include <QDialogButtonBox>
 #include <QFileDialog>
@@ -27,8 +27,8 @@
 #include <QStyle>
 #include <QVBoxLayout>
 
-#include <FF7Save.h>
-#include <FF7SaveInfo.h>
+#include <FF7Save>
+#include <FF7SaveInfo>
 
 MetadataCreator::MetadataCreator(QWidget *parent, FF7Save *ff7save)
     : QDialog(parent)
diff --git a/src/widgets/data/MetadataCreator.h b/src/widgets/data/MetadataCreator.h
index e529b068b..4d66b0467 100644
--- a/src/widgets/data/MetadataCreator.h
+++ b/src/widgets/data/MetadataCreator.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QDialog>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class FF7Save;
 class QDialogButtonBox;
diff --git a/src/widgets/data/OptionsWidget.cpp b/src/widgets/data/OptionsWidget.cpp
index 67afe1b00..66457cbe5 100644
--- a/src/widgets/data/OptionsWidget.cpp
+++ b/src/widgets/data/OptionsWidget.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <OptionsWidget.h>
+#include <OptionsWidget>
 
 #include <QComboBox>
 #include <QCheckBox>
@@ -23,7 +23,7 @@
 #include <QScrollBar>
 #include <QSlider>
 
-#include <DialogPreview.h>
+#include <DialogPreview>
 
 OptionsWidget::OptionsWidget(QWidget *parent) :
     QScrollArea(parent)
diff --git a/src/widgets/data/OptionsWidget.h b/src/widgets/data/OptionsWidget.h
index 35b0dd0a4..b738397cc 100644
--- a/src/widgets/data/OptionsWidget.h
+++ b/src/widgets/data/OptionsWidget.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QScrollArea>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class QComboBox;
 class QCheckBox;
diff --git a/src/widgets/data/PhsListWidget.cpp b/src/widgets/data/PhsListWidget.cpp
index 2fa86a737..8d4fc7efd 100644
--- a/src/widgets/data/PhsListWidget.cpp
+++ b/src/widgets/data/PhsListWidget.cpp
@@ -13,11 +13,11 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <PhsListWidget.h>
+#include <PhsListWidget>
 
 #include <QLabel>
 #include <QVBoxLayout>
-#include <FF7Char.h>
+#include <FF7Char>
 
 PhsListWidget::PhsListWidget(QWidget *parent) :
     QWidget(parent)
diff --git a/src/widgets/data/PhsListWidget.h b/src/widgets/data/PhsListWidget.h
index 70e01b3e4..e46a78134 100644
--- a/src/widgets/data/PhsListWidget.h
+++ b/src/widgets/data/PhsListWidget.h
@@ -17,8 +17,8 @@
 
 #include <QEvent>
 #include <QLabel>
-#include <ff7tkwidgets_export.h>
-#include <DoubleCheckBox.h>
+#include <ff7tkwidgets_export>
+#include <DoubleCheckBox>
 
 /** \class PhsListWidget
  *  \brief Easily manage the who can be in the phs
diff --git a/src/widgets/data/SlotPreview.cpp b/src/widgets/data/SlotPreview.cpp
index 05bf0ed32..cb8180ba5 100644
--- a/src/widgets/data/SlotPreview.cpp
+++ b/src/widgets/data/SlotPreview.cpp
@@ -13,16 +13,14 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <SlotPreview.h>
-#include <SaveIcon.h>
+#include <SlotPreview>
+#include <SaveIcon>
 
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QToolButton>
 #include <QVBoxLayout>
 
-#include <SaveIcon.h>
-
 SlotPreview::SlotPreview(int index, QWidget *parent)
     : QLabel(parent)
     , m_index(index)
diff --git a/src/widgets/data/SlotPreview.h b/src/widgets/data/SlotPreview.h
index 135eaef14..016b786a5 100644
--- a/src/widgets/data/SlotPreview.h
+++ b/src/widgets/data/SlotPreview.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QLabel>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class QHBoxLayout;
 class QToolButton;
diff --git a/src/widgets/data/SlotSelect.cpp b/src/widgets/data/SlotSelect.cpp
index f290c79fa..efd2eaea8 100644
--- a/src/widgets/data/SlotSelect.cpp
+++ b/src/widgets/data/SlotSelect.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <SlotSelect.h>
+#include <SlotSelect>
 
 #include <QFrame>
 #include <QIcon>
@@ -22,9 +22,9 @@
 #include <QScrollBar>
 #include <QVBoxLayout>
 
-#include <SlotPreview.h>
-#include <FF7Char.h>
-#include <FF7Save.h>
+#include <SlotPreview>
+#include <FF7Char>
+#include <FF7Save>
 
 
 SlotSelect::SlotSelect(FF7Save *data, bool loadVisible, QWidget *parent)
diff --git a/src/widgets/data/SlotSelect.h b/src/widgets/data/SlotSelect.h
index ab6b24b32..90c234437 100644
--- a/src/widgets/data/SlotSelect.h
+++ b/src/widgets/data/SlotSelect.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QDialog>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkwidgets_export>
 
 class QVBoxLayout;
 class QWidget;