diff --git a/src/laybasic/laybasic/layColor.cc b/src/laybasic/laybasic/layColor.cc
index ac486cdbb..01b7cdd8d 100644
--- a/src/laybasic/laybasic/layColor.cc
+++ b/src/laybasic/laybasic/layColor.cc
@@ -26,6 +26,7 @@
 #include "tlMath.h"
 
 #include <ctype.h>
+#include <algorithm>
 
 namespace lay
 {
diff --git a/src/laybasic/laybasic/layPixelBuffer.cc b/src/laybasic/laybasic/layPixelBuffer.cc
index f5584d0e2..c5ef44a2b 100644
--- a/src/laybasic/laybasic/layPixelBuffer.cc
+++ b/src/laybasic/laybasic/layPixelBuffer.cc
@@ -290,7 +290,7 @@ QImage
 PixelBuffer::to_image_copy () const
 {
   QImage img (m_width, m_height, m_transparent ? QImage::Format_ARGB32 : QImage::Format_RGB32);
-#if QT_VERSION < 0x050000
+#if QT_VERSION < 0x051000
   memcpy (img.bits (), data (), img.byteCount ());
 #else
   memcpy (img.bits (), data (), img.sizeInBytes ());
@@ -707,7 +707,7 @@ QImage
 BitmapBuffer::to_image_copy () const
 {
   QImage img (m_width, m_height, QImage::Format_MonoLSB);
-#if QT_VERSION < 0x050000
+#if QT_VERSION < 0x051000
   memcpy (img.bits (), data (), img.byteCount ());
 #else
   memcpy (img.bits (), data (), img.sizeInBytes ());
diff --git a/src/layview/layview/gsiDeclLayLayoutView_qt.cc b/src/layview/layview/gsiDeclLayLayoutView_qt.cc
index aac221373..4a86add4b 100644
--- a/src/layview/layview/gsiDeclLayLayoutView_qt.cc
+++ b/src/layview/layview/gsiDeclLayLayoutView_qt.cc
@@ -55,7 +55,7 @@ static lay::LayoutView *new_view2 (bool editable, db::Manager *manager, unsigned
   return new lay::LayoutView (manager, editable, 0 /*plugin parent*/, 0 /*parent*/, "view", options);
 }
 
-extern Class<lay::LayoutViewBase> decl_LayoutViewBase;
+extern LAYBASIC_PUBLIC Class<lay::LayoutViewBase> decl_LayoutViewBase;
 
 Class<lay::LayoutView> decl_LayoutView (decl_LayoutViewBase, "lay", "LayoutView",
 #if defined(HAVE_QTBINDINGS)