diff -urN src.orig/common.mak src/common.mak
--- src.orig/common.mak	2015-07-11 11:42:30 +0000
+++ src/common.mak	2015-07-14 17:46:26 +0000
@@ -121,22 +121,22 @@
   WINDRES	= windres.exe
   CXXFLAGS	+= -g -O2
   STRIP_TARGET  = strip $(TARGET)
-  IPEDEPS	?= /mingwlibs
+  IPEDEPS	?= /opt/windows_32
 endif
 
   ZLIB_CFLAGS   := -I$(IPEDEPS)/include
   ZLIB_LIBS     := -L$(IPEDEPS)/lib -lz
-  JPEG_CFLAGS   := -I$(IPEDEPS)/include/jpeg-turbo
-  JPEG_LIBS     := -L$(IPEDEPS)/lib -lturbojpeg
-  PNG_CFLAGS	:= -I$(IPEDEPS)/include/libpng15
-  PNG_LIBS	:= -L$(IPEDEPS)/lib -lpng15
+  JPEG_CFLAGS   := -I$(IPEDEPS)/include
+  JPEG_LIBS     := -L$(IPEDEPS)/lib -ljpeg
+  PNG_CFLAGS	:= -I$(IPEDEPS)/include/libpng14
+  PNG_LIBS	:= -L$(IPEDEPS)/lib -lpng14
   FREETYPE_CFLAGS := -I$(IPEDEPS)/include/freetype2 \
        -I$(IPEDEPS)/include
   FREETYPE_LIBS := -L$(IPEDEPS)/lib -lfreetype
   CAIRO_CFLAGS  := -I$(IPEDEPS)/include/cairo
   CAIRO_LIBS    := -L$(IPEDEPS)/lib -lcairo
-  LUA_CFLAGS    := -I$(IPEDEPS)/lua52/include
-  LUA_LIBS      := $(IPEDEPS)/lua52/lua52.dll
+  LUA_CFLAGS    := -I/opt/lua52/include
+  LUA_LIBS      := /opt/lua52/lua52.dll
 
 else
   # -------------------- Unix --------------------
diff -urN src.orig/ipe/ipe.exe.manifest src/ipe/ipe.exe.manifest
--- src.orig/ipe/ipe.exe.manifest	1970-01-01 00:00:00 +0000
+++ src/ipe/ipe.exe.manifest	2015-07-14 17:50:44 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+  version="1.0.0.0"
+  processorArchitecture="*"
+  name="Ipe.Ipe.Ipe"
+  type="win32"
+  />
+<description>The Ipe extensible drawing editor.</description>
+<dependency>
+  <dependentAssembly>
+    <assemblyIdentity
+	type="win32"
+	name="Microsoft.Windows.Common-Controls"
+	version="6.0.0.0"
+	processorArchitecture="*"
+	publicKeyToken="6595b64144ccf1df"
+	language="*"
+        />
+  </dependentAssembly>
+</dependency>
+</assembly>
diff -urN src.orig/ipecanvas/ipecanvas_win.cpp src/ipecanvas/ipecanvas_win.cpp
--- src.orig/ipecanvas/ipecanvas_win.cpp	2015-07-11 11:42:30 +0000
+++ src/ipecanvas/ipecanvas_win.cpp	2015-07-14 17:54:04 +0000
@@ -28,11 +28,9 @@
 
 */
 
-#ifndef IPENOGESTURE
 // for touch gestures:  need at least Windows 7
 #define WINVER 0x0601
 #define _WIN32_WINNT 0x0601
-#endif
 
 #include "ipecanvas_win.h"
 #include "ipecairopainter.h"
@@ -46,6 +44,9 @@
 
 using namespace ipe;
 
+typedef WINBOOL WINAPI (*LPFNGETGESTUREINFO)(HGESTUREINFO hGestureInfo, PGESTUREINFO pGestureInfo);
+static LPFNGETGESTUREINFO lpfnGetGestureInfo;
+
 const wchar_t Canvas::className[] = L"ipeCanvasWindowClass";
 
 // --------------------------------------------------------------------
@@ -265,11 +266,13 @@
     if (canvas)
       canvas->updateSize();
     break;
-#ifndef IPENOGESTURE
   case WM_GESTURE: {
+    if (!lpfnGetGestureInfo) {
+        break; // GetGestureInfo was not loaded from user32.dll
+    }
     GESTUREINFO gi = {0};
     gi.cbSize = sizeof(gi);
-    BOOL res = GetGestureInfo((HGESTUREINFO) lParam, &gi);
+    BOOL res = lpfnGetGestureInfo((HGESTUREINFO) lParam, &gi);
     if (res && canvas) {
       if (gi.dwID == GID_PAN)
 	return canvas->handlePanGesture(gi.dwFlags, gi.ptsLocation);
@@ -278,7 +281,6 @@
 					 gi.ullArguments);
     }
     break; }
-#endif
   case WM_MOUSEMOVE:
     if (canvas) {
       int xPos = GET_X_LPARAM(lParam);
@@ -338,6 +340,9 @@
     exit(9);
   }
   assert(GetWindowLongPtr(hwnd, GWLP_USERDATA));
+  
+  HMODULE hDll = LoadLibraryA("user32.dll");
+  lpfnGetGestureInfo = (LPFNGETGESTUREINFO)GetProcAddress(hDll, "GetGestureInfo");  
 }
 
 void Canvas::init(HINSTANCE hInstance)
diff -urN src.orig/ipelib/ipebitmap.cpp src/ipelib/ipebitmap.cpp
--- src.orig/ipelib/ipebitmap.cpp	2015-07-11 11:42:30 +0000
+++ src/ipelib/ipebitmap.cpp	2015-07-14 17:42:06 +0000
@@ -36,7 +36,7 @@
 
 #include <png.h>
 
-#if defined(WIN32) || defined(IPE_TURBOJPEG_API)
+#if defined(IPE_TURBOJPEG_API)
 #include <turbojpeg.h>
 #else
 #include <csetjmp>
@@ -340,7 +340,7 @@
 
 // --------------------------------------------------------------------
 
-#if defined(WIN32) || defined(IPE_TURBOJPEG_API)
+#if defined(IPE_TURBOJPEG_API)
 bool dctDecode(Buffer dctData, Buffer pixelData, int components)
 {
   tjhandle handle = tjInitDecompress();