diff --git a/include/wx/app.h b/include/wx/app.h
index 349bac1acf..e4fd186486 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -51,7 +51,7 @@ public:
 // (e.g. hello.cpp).
 // Now IMPLEMENT_APP should add this code if required.
 
-#if defined(__AIX__) || defined(__SUN__) || defined(__HPUX__)
+#if defined(__AIX__) || defined(__HPUX__)
 #define IMPLEMENT_WXWIN_MAIN \
 extern int wxEntry( int argc, char *argv[] ); \
 int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
diff --git a/src/gdk_imlib/gdk_imlib_private.h b/src/gdk_imlib/gdk_imlib_private.h
index 3da5c6d9bb..e105f30cbe 100644
--- a/src/gdk_imlib/gdk_imlib_private.h
+++ b/src/gdk_imlib/gdk_imlib_private.h
@@ -47,7 +47,7 @@
 #include <jpeglib.h>
 #endif
 #ifdef HAVE_LIBPNG
-#include <png.h>
+#include <../png/png.h>
 #endif
 #ifdef HAVE_LIBTIFF
 #include <tiffio.h>
diff --git a/src/gtk/threadpsx.cpp b/src/gtk/threadpsx.cpp
index 688ef8f29f..80613c5156 100644
--- a/src/gtk/threadpsx.cpp
+++ b/src/gtk/threadpsx.cpp
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <pthread.h>
+#include <errno.h>
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
diff --git a/src/gtk1/threadpsx.cpp b/src/gtk1/threadpsx.cpp
index 688ef8f29f..80613c5156 100644
--- a/src/gtk1/threadpsx.cpp
+++ b/src/gtk1/threadpsx.cpp
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <pthread.h>
+#include <errno.h>
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
diff --git a/user/wxLayout/Makefile b/user/wxLayout/Makefile
new file mode 100644
index 0000000000..027d82ae19
--- /dev/null
+++ b/user/wxLayout/Makefile
@@ -0,0 +1 @@
+include ../../src/gtk/setup/general/makeapp