diff --git a/include/loot/windows_encoding_converters.h b/include/loot/windows_encoding_converters.h
index 1f378c4b..d7395ddc 100644
--- a/include/loot/windows_encoding_converters.h
+++ b/include/loot/windows_encoding_converters.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_HELPERS_HELPERS
-#define LOOT_BACKEND_HELPERS_HELPERS
+#ifndef LOOT_WINDOWS_ENCODING_CONVERTERS
+#define LOOT_WINDOWS_ENCODING_CONVERTERS
 
 #ifdef _WIN32
 
diff --git a/include/loot/yaml/message_content.h b/include/loot/yaml/message_content.h
index 3f49ca43..c09edf9f 100644
--- a/include/loot/yaml/message_content.h
+++ b/include/loot/yaml/message_content.h
@@ -21,8 +21,8 @@
     along with LOOT.  If not, see
     <https://www.gnu.org/licenses/>.
     */
-#ifndef LOOT_BACKEND_METADATA_MESSAGE_CONTENT
-#define LOOT_BACKEND_METADATA_MESSAGE_CONTENT
+#ifndef LOOT_YAML_MESSAGE_CONTENT
+#define LOOT_YAML_MESSAGE_CONTENT
 
 #include <string>
 
diff --git a/include/loot/yaml/plugin_metadata.h b/include/loot/yaml/plugin_metadata.h
index 2cb96dc6..5b496c80 100644
--- a/include/loot/yaml/plugin_metadata.h
+++ b/include/loot/yaml/plugin_metadata.h
@@ -21,8 +21,8 @@
     along with LOOT.  If not, see
     <https://www.gnu.org/licenses/>.
     */
-#ifndef LOOT_BACKEND_METADATA_PLUGIN_METADATA
-#define LOOT_BACKEND_METADATA_PLUGIN_METADATA
+#ifndef LOOT_YAML_PLUGIN_METADATA
+#define LOOT_YAML_PLUGIN_METADATA
 
 #include <cstdint>
 #include <list>
diff --git a/include/loot/yaml/set.h b/include/loot/yaml/set.h
index 68d0c5fa..e8d7ad25 100644
--- a/include/loot/yaml/set.h
+++ b/include/loot/yaml/set.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_HELPERS_YAML_SET_HELPERS
-#define LOOT_BACKEND_HELPERS_YAML_SET_HELPERS
+#ifndef LOOT_YAML_SET
+#define LOOT_YAML_SET
 
 #include <set>
 #include <unordered_set>
diff --git a/include/loot/yaml/tag.h b/include/loot/yaml/tag.h
index c2c47d93..8bdae41a 100644
--- a/include/loot/yaml/tag.h
+++ b/include/loot/yaml/tag.h
@@ -21,8 +21,8 @@
     along with LOOT.  If not, see
     <https://www.gnu.org/licenses/>.
     */
-#ifndef LOOT_BACKEND_METADATA_TAG
-#define LOOT_BACKEND_METADATA_TAG
+#ifndef LOOT_YAML_TAG
+#define LOOT_YAML_TAG
 
 #include <string>
 
diff --git a/src/api/game/game.h b/src/api/game/game.h
index 31aa4fbf..2e02c32b 100644
--- a/src/api/game/game.h
+++ b/src/api/game/game.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_GAME_GAME
-#define LOOT_BACKEND_GAME_GAME
+#ifndef LOOT_API_GAME_GAME
+#define LOOT_API_GAME_GAME
 
 #include <string>
 
diff --git a/src/api/game/game_cache.h b/src/api/game/game_cache.h
index 5c7be2c7..69b56049 100644
--- a/src/api/game/game_cache.h
+++ b/src/api/game/game_cache.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_GAME_GAME_CACHE
-#define LOOT_BACKEND_GAME_GAME_CACHE
+#ifndef LOOT_API_GAME_GAME_CACHE
+#define LOOT_API_GAME_GAME_CACHE
 
 #include <mutex>
 #include <string>
diff --git a/src/api/game/load_order_handler.h b/src/api/game/load_order_handler.h
index c73d8dfa..00b68d92 100644
--- a/src/api/game/load_order_handler.h
+++ b/src/api/game/load_order_handler.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_GAME_LOAD_ORDER_HANDLER
-#define LOOT_BACKEND_GAME_LOAD_ORDER_HANDLER
+#ifndef LOOT_API_GAME_LOAD_ORDER_HANDLER
+#define LOOT_API_GAME_LOAD_ORDER_HANDLER
 
 #include <list>
 #include <string>
diff --git a/src/api/helpers/crc.h b/src/api/helpers/crc.h
index 40529fac..643d800f 100644
--- a/src/api/helpers/crc.h
+++ b/src/api/helpers/crc.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_HELPERS_CRC
-#define LOOT_BACKEND_HELPERS_CRC
+#ifndef LOOT_API_HELPERS_CRC
+#define LOOT_API_HELPERS_CRC
 
 #include <cstdint>
 
diff --git a/src/api/helpers/git_helper.h b/src/api/helpers/git_helper.h
index 1ef72c20..6dc709d3 100644
--- a/src/api/helpers/git_helper.h
+++ b/src/api/helpers/git_helper.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_HELPERS_GIT_HELPER
-#define LOOT_BACKEND_HELPERS_GIT_HELPER
+#ifndef LOOT_API_HELPERS_GIT_HELPER
+#define LOOT_API_HELPERS_GIT_HELPER
 
 #include <string>
 
diff --git a/src/api/helpers/version.h b/src/api/helpers/version.h
index 3250c0a1..ba39c913 100644
--- a/src/api/helpers/version.h
+++ b/src/api/helpers/version.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_HELPERS_VERSION
-#define LOOT_BACKEND_HELPERS_VERSION
+#ifndef LOOT_API_HELPERS_VERSION
+#define LOOT_API_HELPERS_VERSION
 
 #include <regex>
 #include <string>
diff --git a/src/api/masterlist.h b/src/api/masterlist.h
index 3b28a8c0..96d68afc 100644
--- a/src/api/masterlist.h
+++ b/src/api/masterlist.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_MASTERLIST
-#define LOOT_BACKEND_MASTERLIST
+#ifndef LOOT_API_MASTERLIST
+#define LOOT_API_MASTERLIST
 
 #include <string>
 
diff --git a/src/api/metadata/condition_evaluator.h b/src/api/metadata/condition_evaluator.h
index facb4484..8b000f2c 100644
--- a/src/api/metadata/condition_evaluator.h
+++ b/src/api/metadata/condition_evaluator.h
@@ -22,8 +22,8 @@
     <http://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_METADATA_CONDITION_EVALUATOR
-#define LOOT_BACKEND_METADATA_CONDITION_EVALUATOR
+#ifndef LOOT_API_METADATA_CONDITION_EVALUATOR
+#define LOOT_API_METADATA_CONDITION_EVALUATOR
 
 #include <regex>
 #include <string>
diff --git a/src/api/metadata/condition_grammar.h b/src/api/metadata/condition_grammar.h
index d8e78fd1..8859f583 100644
--- a/src/api/metadata/condition_grammar.h
+++ b/src/api/metadata/condition_grammar.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_METADATA_CONDITION_GRAMMAR
-#define LOOT_BACKEND_METADATA_CONDITION_GRAMMAR
+#ifndef LOOT_API_METADATA_CONDITION_GRAMMAR
+#define LOOT_API_METADATA_CONDITION_GRAMMAR
 
 #ifndef BOOST_SPIRIT_UNICODE
 #define BOOST_SPIRIT_UNICODE
diff --git a/src/api/metadata_list.h b/src/api/metadata_list.h
index a3626fed..f2714e8e 100644
--- a/src/api/metadata_list.h
+++ b/src/api/metadata_list.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_METADATA_LIST
-#define LOOT_BACKEND_METADATA_LIST
+#ifndef LOOT_API_METADATA_LIST
+#define LOOT_API_METADATA_LIST
 
 #include <string>
 #include <unordered_set>
diff --git a/src/api/plugin/plugin.h b/src/api/plugin/plugin.h
index 45da65b4..e230ad81 100644
--- a/src/api/plugin/plugin.h
+++ b/src/api/plugin/plugin.h
@@ -21,8 +21,8 @@
     along with LOOT.  If not, see
     <https://www.gnu.org/licenses/>.
     */
-#ifndef LOOT_BACKEND_PLUGIN_PLUGIN
-#define LOOT_BACKEND_PLUGIN_PLUGIN
+#ifndef LOOT_API_PLUGIN_PLUGIN
+#define LOOT_API_PLUGIN_PLUGIN
 
 #include <cstdint>
 #include <list>
diff --git a/src/api/plugin/plugin_sorter.h b/src/api/plugin/plugin_sorter.h
index d745d1f7..74e38100 100644
--- a/src/api/plugin/plugin_sorter.h
+++ b/src/api/plugin/plugin_sorter.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_PLUGIN_PLUGIN_SORTER
-#define LOOT_BACKEND_PLUGIN_PLUGIN_SORTER
+#ifndef LOOT_API_PLUGIN_PLUGIN_SORTER
+#define LOOT_API_PLUGIN_PLUGIN_SORTER
 
 #include <map>
 
diff --git a/src/gui/query/json.h b/src/gui/query/json.h
index 8f1033b3..68a89656 100644
--- a/src/gui/query/json.h
+++ b/src/gui/query/json.h
@@ -22,8 +22,8 @@ along with LOOT.  If not, see
 <https://www.gnu.org/licenses/>.
 */
 
-#ifndef LOOT_BACKEND_HELPERS_JSON
-#define LOOT_BACKEND_HELPERS_JSON
+#ifndef LOOT_GUI_QUERY_JSON
+#define LOOT_GUI_QUERY_JSON
 
 #include <regex>
 
diff --git a/src/gui/state/loot_paths.h b/src/gui/state/loot_paths.h
index 7e3c5384..38a08715 100644
--- a/src/gui/state/loot_paths.h
+++ b/src/gui/state/loot_paths.h
@@ -22,8 +22,8 @@ along with LOOT.  If not, see
 <https://www.gnu.org/licenses/>.
 */
 
-#ifndef LOOT_BACKEND_APP_LOOT_PATHS
-#define LOOT_BACKEND_APP_LOOT_PATHS
+#ifndef LOOT_GUI_STATE_LOOT_PATHS
+#define LOOT_GUI_STATE_LOOT_PATHS
 
 #include <boost/filesystem.hpp>
 
diff --git a/src/gui/state/loot_settings.h b/src/gui/state/loot_settings.h
index 97fa3280..f1f7ff83 100644
--- a/src/gui/state/loot_settings.h
+++ b/src/gui/state/loot_settings.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_APP_LOOT_SETTINGS
-#define LOOT_BACKEND_APP_LOOT_SETTINGS
+#ifndef LOOT_GUI_STATE_LOOT_SETTINGS
+#define LOOT_GUI_STATE_LOOT_SETTINGS
 
 #include <map>
 #include <mutex>
diff --git a/src/gui/state/loot_state.h b/src/gui/state/loot_state.h
index 545e51ae..4c030245 100644
--- a/src/gui/state/loot_state.h
+++ b/src/gui/state/loot_state.h
@@ -22,8 +22,8 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#ifndef LOOT_BACKEND_APP_LOOT_STATE
-#define LOOT_BACKEND_APP_LOOT_STATE
+#ifndef LOOT_GUI_STATE_LOOT_STATE
+#define LOOT_GUI_STATE_LOOT_STATE
 
 #include "gui/state/loot_settings.h"
 #include "gui/state/game.h"