diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index 157ce8e9..ff76ccc3 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -14,6 +14,7 @@
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <cstring>
 #include <type_traits>
 #include <unordered_map>
 
@@ -24,6 +25,8 @@
 
 #include "spdlog/details/null_mutex.h"
 
+#include "spdlog/fmt/fmt.h"
+
 // visual studio upto 2013 does not support noexcept nor constexpr
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
 #define SPDLOG_NOEXCEPT throw()
@@ -48,7 +51,19 @@
 #endif
 #endif
 
-#include "spdlog/fmt/fmt.h"
+
+// Get the basename of __FILE__ (at compile time if possible) 
+#if FMT_HAS_FEATURE(__builtin_strrchr) 
+#define SPDLOG_STRRCHR(str, sep) __builtin_strrchr(str, sep)
+#else
+#define SPDLOG_STRRCHR(str, sep) strrchr(str, sep)
+#endif //__builtin_strrchr not defined
+
+#ifdef _WIN32
+#define SPDLOG_FILE_BASENAME SPDLOG_STRRCHR("\\" __FILE__, '\\') + 1
+#else
+#define SPDLOG_FILE_BASENAME SPDLOG_STRRCHR("/" __FILE__, '/') + 1
+#endif
 
 namespace spdlog {
 
diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h
index f745a5fe..506242ff 100644
--- a/include/spdlog/spdlog.h
+++ b/include/spdlog/spdlog.h
@@ -314,7 +314,7 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 //
 
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE
-#define SPDLOG_LOGGER_TRACE(logger, ...) logger->log(spdlog::source_loc{__FILE__, __LINE__}, spdlog::level::trace, __VA_ARGS__)
+#define SPDLOG_LOGGER_TRACE(logger, ...) logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME, __LINE__}, spdlog::level::trace, __VA_ARGS__)
 #define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__)
 #else
 #define SPDLOG_LOGGER_TRACE(logger, ...) (void)0