diff --git a/lib/Epub/Epub/blocks/ImageBlock.cpp b/lib/Epub/Epub/blocks/ImageBlock.cpp
index 1b71817a..012dcf5f 100644
--- a/lib/Epub/Epub/blocks/ImageBlock.cpp
+++ b/lib/Epub/Epub/blocks/ImageBlock.cpp
@@ -4,8 +4,8 @@
 #include <Logging.h>
 #include <Serialization.h>
 
-#include "../converters/DirectPixelWriter.h"
-#include "../converters/ImageDecoderFactory.h"
+#include "Epub/converters/DirectPixelWriter.h"
+#include "Epub/converters/ImageDecoderFactory.h"
 
 // Cache file format:
 // - uint16_t width
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h
index 3eff96f6..c2d3153d 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t de_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h
index 266578ab..992be031 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t en_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h
index 7b156033..38d6e36e 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t es_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h
index 3345fa2a..2cde6fee 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t fr_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h
index 4f4e5599..e262bdc6 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t it_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h
index ada60695..3da4120e 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t ru_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h
index cfa0a27f..0c8480df 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t uk_trie_data[] = {
diff --git a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
index a25a1dbd..295f58a7 100644
--- a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
+++ b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
@@ -10,11 +10,11 @@
 
 #include <iterator>
 
-#include "../../Epub.h"
-#include "../Page.h"
-#include "../converters/ImageDecoderFactory.h"
-#include "../converters/ImageToFramebufferDecoder.h"
-#include "../htmlEntities.h"
+#include "Epub.h"
+#include "Epub/Page.h"
+#include "Epub/converters/ImageDecoderFactory.h"
+#include "Epub/converters/ImageToFramebufferDecoder.h"
+#include "Epub/htmlEntities.h"
 
 // Minimum file size (in bytes) to show indexing popup - smaller chapters don't benefit from it
 constexpr size_t MIN_SIZE_FOR_POPUP = 10 * 1024;  // 10KB
diff --git a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h
index aeaea7f5..623dc858 100644
--- a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h
+++ b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h
@@ -8,12 +8,12 @@
 #include <string>
 #include <vector>
 
-#include "../FootnoteEntry.h"
-#include "../ParsedText.h"
-#include "../blocks/ImageBlock.h"
-#include "../blocks/TextBlock.h"
-#include "../css/CssParser.h"
-#include "../css/CssStyle.h"
+#include "Epub/FootnoteEntry.h"
+#include "Epub/ParsedText.h"
+#include "Epub/blocks/ImageBlock.h"
+#include "Epub/blocks/TextBlock.h"
+#include "Epub/css/CssParser.h"
+#include "Epub/css/CssStyle.h"
 
 class Page;
 class GfxRenderer;
diff --git a/lib/Epub/Epub/parsers/ContentOpfParser.cpp b/lib/Epub/Epub/parsers/ContentOpfParser.cpp
index f75fd2d0..1707b310 100644
--- a/lib/Epub/Epub/parsers/ContentOpfParser.cpp
+++ b/lib/Epub/Epub/parsers/ContentOpfParser.cpp
@@ -5,7 +5,7 @@
 #include <Serialization.h>
 #include <XmlParserUtils.h>
 
-#include "../BookMetadataCache.h"
+#include "Epub/BookMetadataCache.h"
 
 namespace {
 constexpr char MEDIA_TYPE_NCX[] = "application/x-dtbncx+xml";
diff --git a/lib/Epub/Epub/parsers/TocNavParser.cpp b/lib/Epub/Epub/parsers/TocNavParser.cpp
index dc293c14..01ca8bef 100644
--- a/lib/Epub/Epub/parsers/TocNavParser.cpp
+++ b/lib/Epub/Epub/parsers/TocNavParser.cpp
@@ -4,7 +4,7 @@
 #include <Logging.h>
 #include <XmlParserUtils.h>
 
-#include "../BookMetadataCache.h"
+#include "Epub/BookMetadataCache.h"
 
 bool TocNavParser::setup() {
   parser = XML_ParserCreate(nullptr);
diff --git a/lib/Epub/Epub/parsers/TocNcxParser.cpp b/lib/Epub/Epub/parsers/TocNcxParser.cpp
index ac968010..5c0400aa 100644
--- a/lib/Epub/Epub/parsers/TocNcxParser.cpp
+++ b/lib/Epub/Epub/parsers/TocNcxParser.cpp
@@ -4,7 +4,7 @@
 #include <Logging.h>
 #include <XmlParserUtils.h>
 
-#include "../BookMetadataCache.h"
+#include "Epub/BookMetadataCache.h"
 
 bool TocNcxParser::setup() {
   parser = XML_ParserCreate(nullptr);
diff --git a/lib/KOReaderSync/KOReaderCredentialStore.cpp b/lib/KOReaderSync/KOReaderCredentialStore.cpp
index 896b1160..f7528c5a 100644
--- a/lib/KOReaderSync/KOReaderCredentialStore.cpp
+++ b/lib/KOReaderSync/KOReaderCredentialStore.cpp
@@ -6,7 +6,7 @@
 #include <ObfuscationUtils.h>
 #include <Serialization.h>
 
-#include "../../src/JsonSettingsIO.h"
+#include "KOReaderJsonIO.h"
 
 // Initialize the static instance
 KOReaderCredentialStore KOReaderCredentialStore::instance;
@@ -36,7 +36,7 @@ void legacyDeobfuscate(std::string& data) {
 
 bool KOReaderCredentialStore::saveToFile() const {
   Storage.mkdir("/.crosspoint");
-  return JsonSettingsIO::saveKOReader(*this, KOREADER_FILE_JSON);
+  return KOReaderJsonIO::save(*this, KOREADER_FILE_JSON);
 }
 
 bool KOReaderCredentialStore::loadFromFile() {
@@ -45,7 +45,7 @@ bool KOReaderCredentialStore::loadFromFile() {
     String json = Storage.readFile(KOREADER_FILE_JSON);
     if (!json.isEmpty()) {
       bool resave = false;
-      bool result = JsonSettingsIO::loadKOReader(*this, json.c_str(), &resave);
+      bool result = KOReaderJsonIO::load(*this, json.c_str(), &resave);
       if (result && resave) {
         saveToFile();
         LOG_DBG("KRS", "Resaved KOReader credentials to update format");
diff --git a/lib/KOReaderSync/KOReaderCredentialStore.h b/lib/KOReaderSync/KOReaderCredentialStore.h
index 89e008d0..c2ea515d 100644
--- a/lib/KOReaderSync/KOReaderCredentialStore.h
+++ b/lib/KOReaderSync/KOReaderCredentialStore.h
@@ -8,12 +8,6 @@ enum class DocumentMatchMethod : uint8_t {
   BINARY = 1,    // Match by partial MD5 of file content (more accurate, but files must be identical)
 };
 
-class KOReaderCredentialStore;
-namespace JsonSettingsIO {
-bool saveKOReader(const KOReaderCredentialStore& store, const char* path);
-bool loadKOReader(KOReaderCredentialStore& store, const char* json, bool* needsResave);
-}  // namespace JsonSettingsIO
-
 /**
  * Singleton class for storing KOReader sync credentials on the SD card.
  * Passwords are XOR-obfuscated with the device's unique hardware MAC address
@@ -33,9 +27,6 @@ class KOReaderCredentialStore {
 
   bool loadFromBinaryFile();
 
-  friend bool JsonSettingsIO::saveKOReader(const KOReaderCredentialStore&, const char*);
-  friend bool JsonSettingsIO::loadKOReader(KOReaderCredentialStore&, const char*, bool*);
-
  public:
   // Delete copy constructor and assignment
   KOReaderCredentialStore(const KOReaderCredentialStore&) = delete;
diff --git a/lib/KOReaderSync/KOReaderJsonIO.cpp b/lib/KOReaderSync/KOReaderJsonIO.cpp
new file mode 100644
index 00000000..05bfc119
--- /dev/null
+++ b/lib/KOReaderSync/KOReaderJsonIO.cpp
@@ -0,0 +1,51 @@
+#include "KOReaderJsonIO.h"
+
+#include <ArduinoJson.h>
+#include <HalStorage.h>
+#include <Logging.h>
+#include <ObfuscationUtils.h>
+
+#include "KOReaderCredentialStore.h"
+
+namespace KOReaderJsonIO {
+
+bool save(const KOReaderCredentialStore& store, const char* path) {
+  JsonDocument doc;
+  doc["username"] = store.getUsername();
+  doc["password_obf"] = obfuscation::obfuscateToBase64(store.getPassword());
+  doc["serverUrl"] = store.getServerUrl();
+  doc["matchMethod"] = static_cast<uint8_t>(store.getMatchMethod());
+
+  String json;
+  serializeJson(doc, json);
+  return Storage.writeFile(path, json);
+}
+
+bool load(KOReaderCredentialStore& store, const char* json, bool* needsResave) {
+  if (needsResave) *needsResave = false;
+  JsonDocument doc;
+  auto error = deserializeJson(doc, json);
+  if (error) {
+    LOG_ERR("KRS", "JSON parse error: %s", error.c_str());
+    return false;
+  }
+
+  std::string user = doc["username"] | std::string("");
+
+  bool ok = false;
+  std::string pass = obfuscation::deobfuscateFromBase64(doc["password_obf"] | "", &ok);
+  if (!ok || pass.empty()) {
+    pass = doc["password"] | std::string("");
+    if (!pass.empty() && needsResave) *needsResave = true;
+  }
+
+  store.setCredentials(user, pass);
+  store.setServerUrl(doc["serverUrl"] | std::string(""));
+
+  uint8_t method = doc["matchMethod"] | (uint8_t)0;
+  store.setMatchMethod(static_cast<DocumentMatchMethod>(method));
+
+  return true;
+}
+
+}  // namespace KOReaderJsonIO
diff --git a/lib/KOReaderSync/KOReaderJsonIO.h b/lib/KOReaderSync/KOReaderJsonIO.h
new file mode 100644
index 00000000..c8d8eb81
--- /dev/null
+++ b/lib/KOReaderSync/KOReaderJsonIO.h
@@ -0,0 +1,8 @@
+#pragma once
+
+class KOReaderCredentialStore;
+
+namespace KOReaderJsonIO {
+bool save(const KOReaderCredentialStore& store, const char* path);
+bool load(KOReaderCredentialStore& store, const char* json, bool* needsResave);
+}  // namespace KOReaderJsonIO
diff --git a/scripts/generate_hyphenation_trie.py b/scripts/generate_hyphenation_trie.py
index 9db0e27b..32305b4f 100755
--- a/scripts/generate_hyphenation_trie.py
+++ b/scripts/generate_hyphenation_trie.py
@@ -60,7 +60,7 @@ def write_header(path: pathlib.Path, blob: bytes, symbol: str) -> None:
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t {data_symbol}[] = {{
diff --git a/src/JsonSettingsIO.cpp b/src/JsonSettingsIO.cpp
index fb60cd0b..6becefc3 100644
--- a/src/JsonSettingsIO.cpp
+++ b/src/JsonSettingsIO.cpp
@@ -10,7 +10,6 @@
 
 #include "CrossPointSettings.h"
 #include "CrossPointState.h"
-#include "KOReaderCredentialStore.h"
 #include "OpdsServerStore.h"
 #include "RecentBooksStore.h"
 #include "SettingsList.h"
@@ -251,44 +250,6 @@ bool JsonSettingsIO::loadSettings(CrossPointSettings& s, const char* json, bool*
   return true;
 }
 
-// ---- KOReaderCredentialStore ----
-
-bool JsonSettingsIO::saveKOReader(const KOReaderCredentialStore& store, const char* path) {
-  JsonDocument doc;
-  doc["username"] = store.getUsername();
-  doc["password_obf"] = obfuscation::obfuscateToBase64(store.getPassword());
-  doc["serverUrl"] = store.getServerUrl();
-  doc["matchMethod"] = static_cast<uint8_t>(store.getMatchMethod());
-
-  String json;
-  serializeJson(doc, json);
-  return Storage.writeFile(path, json);
-}
-
-bool JsonSettingsIO::loadKOReader(KOReaderCredentialStore& store, const char* json, bool* needsResave) {
-  if (needsResave) *needsResave = false;
-  JsonDocument doc;
-  auto error = deserializeJson(doc, json);
-  if (error) {
-    LOG_ERR("KRS", "JSON parse error: %s", error.c_str());
-    return false;
-  }
-
-  store.username = doc["username"] | std::string("");
-  bool ok = false;
-  store.password = obfuscation::deobfuscateFromBase64(doc["password_obf"] | "", &ok);
-  if (!ok || store.password.empty()) {
-    store.password = doc["password"] | std::string("");
-    if (!store.password.empty() && needsResave) *needsResave = true;
-  }
-  store.serverUrl = doc["serverUrl"] | std::string("");
-  uint8_t method = doc["matchMethod"] | (uint8_t)0;
-  store.matchMethod = static_cast<DocumentMatchMethod>(method);
-
-  LOG_DBG("KRS", "Loaded KOReader credentials for user: %s", store.username.c_str());
-  return true;
-}
-
 // ---- WifiCredentialStore ----
 
 bool JsonSettingsIO::saveWifi(const WifiCredentialStore& store, const char* path) {
diff --git a/src/JsonSettingsIO.h b/src/JsonSettingsIO.h
index 40d6c4d2..95d96b35 100644
--- a/src/JsonSettingsIO.h
+++ b/src/JsonSettingsIO.h
@@ -3,7 +3,6 @@
 class CrossPointSettings;
 class CrossPointState;
 class WifiCredentialStore;
-class KOReaderCredentialStore;
 class RecentBooksStore;
 class OpdsServerStore;
 
@@ -21,10 +20,6 @@ bool loadState(CrossPointState& s, const char* json);
 bool saveWifi(const WifiCredentialStore& store, const char* path);
 bool loadWifi(WifiCredentialStore& store, const char* json, bool* needsResave = nullptr);
 
-// KOReaderCredentialStore
-bool saveKOReader(const KOReaderCredentialStore& store, const char* path);
-bool loadKOReader(KOReaderCredentialStore& store, const char* json, bool* needsResave = nullptr);
-
 // RecentBooksStore
 bool saveRecentBooks(const RecentBooksStore& store, const char* path);
 bool loadRecentBooks(RecentBooksStore& store, const char* json);
diff --git a/src/activities/boot_sleep/BootActivity.h b/src/activities/boot_sleep/BootActivity.h
index 312f2ab0..72343b6b 100644
--- a/src/activities/boot_sleep/BootActivity.h
+++ b/src/activities/boot_sleep/BootActivity.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class BootActivity final : public Activity {
  public:
diff --git a/src/activities/boot_sleep/SleepActivity.h b/src/activities/boot_sleep/SleepActivity.h
index 87df8ba1..7d6235b6 100644
--- a/src/activities/boot_sleep/SleepActivity.h
+++ b/src/activities/boot_sleep/SleepActivity.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class Bitmap;
 
diff --git a/src/activities/browser/OpdsBookBrowserActivity.h b/src/activities/browser/OpdsBookBrowserActivity.h
index 853f23e1..437ba58b 100644
--- a/src/activities/browser/OpdsBookBrowserActivity.h
+++ b/src/activities/browser/OpdsBookBrowserActivity.h
@@ -5,8 +5,8 @@
 #include <utility>
 #include <vector>
 
-#include "../Activity.h"
 #include "OpdsServerStore.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 /**
diff --git a/src/activities/home/CrashActivity.h b/src/activities/home/CrashActivity.h
index 9b4641ed..7537b888 100644
--- a/src/activities/home/CrashActivity.h
+++ b/src/activities/home/CrashActivity.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class CrashActivity final : public Activity {
   std::string panicMessage;
diff --git a/src/activities/home/FileBrowserActivity.cpp b/src/activities/home/FileBrowserActivity.cpp
index 870e93b6..db9f306e 100644
--- a/src/activities/home/FileBrowserActivity.cpp
+++ b/src/activities/home/FileBrowserActivity.cpp
@@ -8,9 +8,9 @@
 
 #include <algorithm>
 
-#include "../util/ConfirmationActivity.h"
 #include "CrossPointSettings.h"
 #include "MappedInputManager.h"
+#include "activities/util/ConfirmationActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
diff --git a/src/activities/home/FileBrowserActivity.h b/src/activities/home/FileBrowserActivity.h
index 15efbd60..e2fdc968 100644
--- a/src/activities/home/FileBrowserActivity.h
+++ b/src/activities/home/FileBrowserActivity.h
@@ -4,8 +4,8 @@
 #include <string>
 #include <vector>
 
-#include "../Activity.h"
 #include "RecentBooksStore.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class FileBrowserActivity final : public Activity {
diff --git a/src/activities/home/HomeActivity.h b/src/activities/home/HomeActivity.h
index 7b743e77..e3bfd4db 100644
--- a/src/activities/home/HomeActivity.h
+++ b/src/activities/home/HomeActivity.h
@@ -2,8 +2,8 @@
 #include <functional>
 #include <vector>
 
-#include "../Activity.h"
 #include "./FileBrowserActivity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 struct RecentBook;
diff --git a/src/activities/home/RecentBooksActivity.h b/src/activities/home/RecentBooksActivity.h
index b1103f04..c9c70b36 100644
--- a/src/activities/home/RecentBooksActivity.h
+++ b/src/activities/home/RecentBooksActivity.h
@@ -5,8 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "../Activity.h"
 #include "RecentBooksStore.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class RecentBooksActivity final : public Activity {
diff --git a/src/activities/network/NetworkModeSelectionActivity.h b/src/activities/network/NetworkModeSelectionActivity.h
index a119bc1b..e9524c65 100644
--- a/src/activities/network/NetworkModeSelectionActivity.h
+++ b/src/activities/network/NetworkModeSelectionActivity.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 enum class NetworkMode { JOIN_NETWORK, CONNECT_CALIBRE, CREATE_HOTSPOT };
diff --git a/src/activities/reader/EpubReaderChapterSelectionActivity.h b/src/activities/reader/EpubReaderChapterSelectionActivity.h
index 20b53aa4..9d593e30 100644
--- a/src/activities/reader/EpubReaderChapterSelectionActivity.h
+++ b/src/activities/reader/EpubReaderChapterSelectionActivity.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class EpubReaderChapterSelectionActivity final : public Activity {
diff --git a/src/activities/reader/EpubReaderFootnotesActivity.h b/src/activities/reader/EpubReaderFootnotesActivity.h
index 7336d038..520feeed 100644
--- a/src/activities/reader/EpubReaderFootnotesActivity.h
+++ b/src/activities/reader/EpubReaderFootnotesActivity.h
@@ -6,7 +6,7 @@
 #include <functional>
 #include <vector>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class EpubReaderFootnotesActivity final : public Activity {
diff --git a/src/activities/reader/EpubReaderMenuActivity.h b/src/activities/reader/EpubReaderMenuActivity.h
index 9ddba93d..2d967063 100644
--- a/src/activities/reader/EpubReaderMenuActivity.h
+++ b/src/activities/reader/EpubReaderMenuActivity.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class EpubReaderMenuActivity final : public Activity {
diff --git a/src/activities/reader/ReaderActivity.h b/src/activities/reader/ReaderActivity.h
index f5c61a39..52625ecc 100644
--- a/src/activities/reader/ReaderActivity.h
+++ b/src/activities/reader/ReaderActivity.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <memory>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "activities/home/FileBrowserActivity.h"
 
 class Epub;
diff --git a/src/activities/reader/XtcReaderChapterSelectionActivity.h b/src/activities/reader/XtcReaderChapterSelectionActivity.h
index 42040ad5..3c94f128 100644
--- a/src/activities/reader/XtcReaderChapterSelectionActivity.h
+++ b/src/activities/reader/XtcReaderChapterSelectionActivity.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class XtcReaderChapterSelectionActivity final : public Activity {
diff --git a/src/activities/settings/LanguageSelectActivity.h b/src/activities/settings/LanguageSelectActivity.h
index b8662554..aa2a68bb 100644
--- a/src/activities/settings/LanguageSelectActivity.h
+++ b/src/activities/settings/LanguageSelectActivity.h
@@ -5,7 +5,7 @@
 
 #include <functional>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "components/UITheme.h"
 #include "util/ButtonNavigator.h"
 
diff --git a/src/activities/util/BmpViewerActivity.h b/src/activities/util/BmpViewerActivity.h
index f805d375..24c084db 100644
--- a/src/activities/util/BmpViewerActivity.h
+++ b/src/activities/util/BmpViewerActivity.h
@@ -3,8 +3,8 @@
 #include <functional>
 #include <string>
 
-#include "../Activity.h"
 #include "MappedInputManager.h"
+#include "activities/Activity.h"
 
 class BmpViewerActivity final : public Activity {
  public:
diff --git a/src/activities/util/ConfirmationActivity.cpp b/src/activities/util/ConfirmationActivity.cpp
index ee18ef25..f37cfde8 100644
--- a/src/activities/util/ConfirmationActivity.cpp
+++ b/src/activities/util/ConfirmationActivity.cpp
@@ -2,8 +2,8 @@
 
 #include <I18n.h>
 
-#include "../../components/UITheme.h"
 #include "HalDisplay.h"
+#include "components/UITheme.h"
 
 ConfirmationActivity::ConfirmationActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
                                            const std::string& heading, const std::string& body)
diff --git a/src/activities/util/ConfirmationActivity.h b/src/activities/util/ConfirmationActivity.h
index 9f024d92..1a4051cb 100644
--- a/src/activities/util/ConfirmationActivity.h
+++ b/src/activities/util/ConfirmationActivity.h
@@ -2,8 +2,8 @@
 #include <functional>
 #include <string>
 
-#include "../../fontIds.h"
-#include "../Activity.h"
+#include "activities/Activity.h"
+#include "fontIds.h"
 
 class ConfirmationActivity : public Activity {
  private:
diff --git a/src/activities/util/FullScreenMessageActivity.h b/src/activities/util/FullScreenMessageActivity.h
index 93909503..c8660208 100644
--- a/src/activities/util/FullScreenMessageActivity.h
+++ b/src/activities/util/FullScreenMessageActivity.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <utility>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class FullScreenMessageActivity final : public Activity {
   std::string text;
diff --git a/src/activities/util/KeyboardEntryActivity.h b/src/activities/util/KeyboardEntryActivity.h
index 0a86febf..128808ac 100644
--- a/src/activities/util/KeyboardEntryActivity.h
+++ b/src/activities/util/KeyboardEntryActivity.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <utility>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 struct KeyDef {