diff --git a/src/myx/filesystem/paths.cpp b/src/myx/filesystem/paths.cpp
index 91afdf0..de974f9 100644
--- a/src/myx/filesystem/paths.cpp
+++ b/src/myx/filesystem/paths.cpp
@@ -1,7 +1,7 @@
 #include "paths.hpp"
 
 #include <myx/base/config.hpp>
-#include "whereami++.h"
+#include <myx/filesystem/whereami.hpp>
 
 #include <paths.h>
 #include <QString>
diff --git a/src/filesystem/whereami.cpp b/src/myx/filesystem/whereami.cpp
similarity index 98%
rename from src/filesystem/whereami.cpp
rename to src/myx/filesystem/whereami.cpp
index 5145ae2..1dcebb4 100644
--- a/src/filesystem/whereami.cpp
+++ b/src/myx/filesystem/whereami.cpp
@@ -10,7 +10,7 @@ namespace {
 extern "C" {
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #ifndef WAI_NOINLINE
 #if defined( _MSC_VER )
@@ -143,10 +143,10 @@ int getModulePath( char* out, int capacity, int* dirname_length )
 				uint64_t addr = reinterpret_cast< uintptr_t >( WAI_RETURN_ADDRESS() );
 				if ( ( low <= addr ) && ( addr <= high ) )
 				{
-					char* resolved;
+					char* resolved = nullptr;
 
 					resolved = realpath( path, buffer );
-					if ( !resolved )
+					if ( resolved == nullptr )
 					{
 						break;
 					}
@@ -185,7 +185,7 @@ int getModulePath( char* out, int capacity, int* dirname_length )
 		}
 	}
 
-	if ( maps )
+	if ( maps != nullptr )
 	{
 		fclose( maps );
 	}
diff --git a/src/filesystem/whereami.hpp b/src/myx/filesystem/whereami.hpp
similarity index 100%
rename from src/filesystem/whereami.hpp
rename to src/myx/filesystem/whereami.hpp
diff --git a/src/myx/qt/translators.cpp b/src/myx/qt/translators.cpp
index 4b29c26..668cdb3 100644
--- a/src/myx/qt/translators.cpp
+++ b/src/myx/qt/translators.cpp
@@ -11,7 +11,7 @@ namespace qt {
 
 void append_translators( QTranslatorsList& translators, const QString& appName )
 {
-	auto* translator = new QTranslator( qApp );
+	auto translator = new QTranslator( qApp );
 
 	if ( translator->load( QLocale(), appName, QStringLiteral( "_" ),
 	                       QStringLiteral( ":/qm" ) ) )