diff --git a/src/myx/filesystem/whereami.cpp b/src/myx/filesystem/whereami.cpp
index 1dcebb4..3d4565d 100644
--- a/src/myx/filesystem/whereami.cpp
+++ b/src/myx/filesystem/whereami.cpp
@@ -1,6 +1,4 @@
-#if !defined( WHEREAMIPP_H )
-#include <whereami.hpp>
-#endif
+#include <myx/filesystem/whereami.hpp>
 
 namespace whereami {
 
diff --git a/src/myx/filesystem/whereami.hpp b/src/myx/filesystem/whereami.hpp
index 3237a2a..f4d01c0 100644
--- a/src/myx/filesystem/whereami.hpp
+++ b/src/myx/filesystem/whereami.hpp
@@ -67,8 +67,8 @@ typedef WHEREAMI_STRING_T whereami_string_t;
 #endif
 
 #if defined( __GNUC__ )
-#if !( ( __GNUC__ * 100 + __GNUC_MINOR__ ) < 408 )
-     #undef WHEREAMI_CXX11
+#if ( ( __GNUC__ * 100 + __GNUC_MINOR__ ) < 408 )
+  #undef WHEREAMI_CXX11
 #endif
 #endif