diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index edbaef8fed..e81f673d20 100644
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -100,6 +100,11 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
     return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
 }
 
+wxString wxStandardPaths::GetExecutablePath() const
+{
+    return wxStandardPathsBase::GetExecutablePath();
+}
+
 #else // !__VMS
 
 // ============================================================================
diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 3abc8df228..73406ad376 100644
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1372,7 +1372,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
 
         XpmFreeAttributes(&xpmAttr);
 
-        M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap;
+        M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap;
 
         if (mask)
         {
@@ -1497,7 +1497,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
 
         XpmFreeAttributes(&xpmAttr);
 
-        M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
+        M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap;
 
         if (mask)
         {