diff --git a/repertory/librepertory/src/app_config.cpp b/repertory/librepertory/src/app_config.cpp
index dc2aefdf..067a1067 100644
--- a/repertory/librepertory/src/app_config.cpp
+++ b/repertory/librepertory/src/app_config.cpp
@@ -72,7 +72,7 @@ app_config::app_config(const provider_type &prov,
       enable_max_cache_size_(false),
 #if defined(_WIN32)
       enable_mount_manager_(false),
-#endif
+#endif // defined(_WIN32)
       enable_remote_mount_(false),
       event_level_(event_level::info),
       eviction_delay_mins_(default_eviction_delay_mins),
@@ -159,7 +159,7 @@ auto app_config::default_data_directory(const provider_type &prov)
                                REPERTORY_DATA_NAME,
                                app_config::get_provider_name(prov),
                            });
-#else
+#else // !defined(_WIN32)
 #if defined(__APPLE__)
   auto data_directory =
       utils::path::combine("~", {
@@ -168,15 +168,15 @@ auto app_config::default_data_directory(const provider_type &prov)
                                     REPERTORY_DATA_NAME,
                                     app_config::get_provider_name(prov),
                                 });
-#else
+#else  // !defined(__APPLE__)
   auto data_directory =
       utils::path::combine("~", {
                                     ".local",
                                     REPERTORY_DATA_NAME,
                                     app_config::get_provider_name(prov),
                                 });
-#endif
-#endif
+#endif // defined(__APPLE__)
+#endif // defined(_WIN32)
   return data_directory;
 }
 
@@ -215,7 +215,7 @@ auto app_config::get_json() const -> json {
       {"EnableDriveEvents", enable_drive_events_},
 #if defined(_WIN32)
       {"EnableMountManager", enable_mount_manager_},
-#endif
+#endif // defined(_WIN32)
       {"EnableMaxCacheSize", enable_max_cache_size_},
       {"EncryptConfig",
        {
@@ -390,7 +390,7 @@ auto app_config::get_value_by_name(const std::string &name) -> std::string {
     }
     if (name == "EnableMountManager") {
       return std::to_string(get_enable_mount_manager());
-#endif
+#endif // defined(_WIN32)
     }
     if (name == "EncryptConfig.Path") {
       return utils::path::absolute(encrypt_config_.path);
@@ -623,7 +623,7 @@ auto app_config::load() -> bool {
 #if defined(_WIN32)
           get_value(json_document, "EnableMountManager", enable_mount_manager_,
                     ret);
-#endif
+#endif // defined(_WIN32)
           get_value(json_document, "MaxCacheSizeBytes", max_cache_size_bytes_,
                     ret);
           get_value(json_document, "MaxUploadCount", max_upload_count_, ret);
@@ -773,7 +773,7 @@ auto app_config::set_value_by_name(const std::string &name,
     if (name == "EnableMountManager") {
       set_enable_mount_manager(utils::string::to_bool(value));
       return utils::string::from_bool(get_enable_mount_manager());
-#endif
+#endif // defined(_WIN32)
     }
     if (name == "EncryptConfig.EncryptionToken") {
       set_value(encrypt_config_.encryption_token, value);