diff --git a/configure.ac b/configure.ac
index d395c89..ce74099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@
 	CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_IE=0x0500"
 	CXXFLAGS="$CXXFLAGS -mthreads"
 	BUILD_WIN=yes
+	AC_CHECK_TOOL([WINDRES], windres, [AC_MSG_ERROR(windres not found)])
 	;;
 esac
 AM_CONDITIONAL([BUILD_WIN], [test "x$BUILD_WIN" = xyes])
@@ -156,4 +157,7 @@
 unix/vncviewer/Makefile
 unix/vncconfig/Makefile
 unix/vncpasswd/Makefile
+win/Makefile
+win/vncviewer/Makefile
+win/rfb_win32/Makefile
 ])
diff --git a/win/Makefile.am b/win/Makefile.am
index d81086d..945e4e8 100644
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = ../common rfb_win32 vncviewer
+SUBDIRS = rfb_win32 vncviewer
 
diff --git a/win/configure.ac b/win/configure.ac
deleted file mode 100644
index e9e0c40..0000000
--- a/win/configure.ac
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.57])
-AC_INIT([tigervnc], [0.0.91], [http://www.tigervnc.org])
-AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
-
-AC_SUBST([COMMON_DIR], ['$(top_srcdir)/../common'])
-
-AC_CONFIG_SUBDIRS([../common])
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_CHECK_TOOL([WINDRES], windres, [AC_MSG_ERROR(windres not found)])
-AC_LANG([C++])
-
-if test "$GCC" = yes; then
-  CFLAGS="$CFLAGS -Wall"
-fi
-if test "$GXX" = yes; then
-  CXXFLAGS="$CXXFLAGS -Wall"
-fi
-
-CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_IE=0x0500"
-CXXFLAGS="$CXXFLAGS -mthreads"
-
-AC_PATH_XTRA
-
-AC_OUTPUT(Makefile
-         vncviewer/Makefile
-	 rfb_win32/Makefile
-)
diff --git a/win/rfb_win32/Makefile.am b/win/rfb_win32/Makefile.am
index e1e9c7c..7c5d1c5 100644
--- a/win/rfb_win32/Makefile.am
+++ b/win/rfb_win32/Makefile.am
@@ -99,5 +99,5 @@
   WMShatter.cxx \
   WMWindowCopyRect.cxx
 
-librfb_win32_la_CPPFLAGS = -I$(top_srcdir) -I$(COMMON_DIR)
+librfb_win32_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
 librfb_win32_la_LIBADD =
diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am
index dddef27..201f1e1 100644
--- a/win/vncviewer/Makefile.am
+++ b/win/vncviewer/Makefile.am
@@ -30,13 +30,13 @@
   ViewerToolBar.cxx \
   vncviewer.cxx
 
-vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir)
+vncviewer_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
 
-vncviewer_LDADD = $(COMMON_DIR)/rfb/librfb.la \
-    $(top_srcdir)/rfb_win32/librfb_win32.la \
-    $(COMMON_DIR)/Xregion/libXregion.la \
-    $(COMMON_DIR)/network/libnetwork.la \
-    $(COMMON_DIR)/rdr/librdr.la \
+vncviewer_LDADD = $(top_srcdir)/common/rfb/librfb.la \
+    $(top_srcdir)/win/rfb_win32/librfb_win32.la \
+    $(top_srcdir)/common/Xregion/libXregion.la \
+    $(top_srcdir)/common/network/libnetwork.la \
+    $(top_srcdir)/common/rdr/librdr.la \
     resources.o -lws2_32 -lgdi32 -luser32 -lcomctl32 -lversion -lcomdlg32
 
 vncviewer_LDFLAGS = -I$(top_srcdir)/win -mwindows