diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index baccc0131f..8021da6a17 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -167,7 +167,7 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s);
 WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
   WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
   WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
   WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 8bd7b8965e..0f1c587e6c 100644
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -54,7 +54,7 @@ protected:
     #include "wx/msw/statbr95.h"
 
     typedef wxStatusBar95 wxStatusBarReal;
-#elif defined(__WXMAC__) /* && !defined(__UNIX__) */
+#elif defined(__WXMAC__)
     #include "wx/generic/statusbr.h"
     #include "wx/mac/statusbr.h"