Index: libs-dephack.pro
===================================================================
--- libs-dephack.pro	(revision 17662)
+++ libs-dephack.pro	(working copy)
@@ -4,12 +4,6 @@
 
 #macx:QMAKE_LFLAGS_SHLIB += -undefined warning
 
-mingw {
-    # Worked around by building libmyth first,
-    # with dlltool faking the symbols from the other two libs
-    LIBS += -L../libmyth -lmyth-$$LIBVERSION
-}
-
 #unix {
     # Search for --as-needed in the link paths, and remove it
 #}
Index: libmyth/libmyth.pro
===================================================================
--- libmyth/libmyth.pro	(revision 17662)
+++ libmyth/libmyth.pro	(working copy)
@@ -103,27 +103,10 @@
 }
 
 mingw {
-    include ( ../libs-windows.pro )
-
     SOURCES += mediamonitor-windows.cpp audiooutputwin.cpp
     HEADERS += mediamonitor-windows.h   audiooutputwin.h
 
     LIBS += -lpthread -lwinmm -lws2_32
-
-    LIBS -= -lmythui-$$LIBVERSION  -lmythupnp-$$LIBVERSION 
-    LIBS += -L. -lmythui-bootstrap -lmythupnp-bootstrap
-    POST_TARGETDEPS += libmythui-bootstrap.a libmythupnp-bootstrap.a
-    implib.target    = libmythui-bootstrap.a
-    implib.depends   = ../libmythui/libmythui.def
-    implib.commands  = dlltool --input-def $$implib.depends   \
-                       --dllname libmythui-$${LIBVERSION}.dll \
-                       --output-lib $$implib.target  -k
-    implib2.target   = libmythupnp-bootstrap.a
-    implib2.depends  = ../libmythupnp/libmythupnp.def
-    implib2.commands = dlltool --input-def $$implib2.depends    \
-                       --dllname libmythupnp-$${LIBVERSION}.dll \
-                       --output-lib $$implib2.target  -k
-    QMAKE_EXTRA_WIN_TARGETS += implib implib2
 }
 
 macx {
Index: libmythdb/mythdbcon.cpp
===================================================================
--- libmythdb/mythdbcon.cpp	(revision 17662)
+++ libmythdb/mythdbcon.cpp	(working copy)
@@ -8,6 +8,7 @@
 #include "mythdbcon.h"
 #include "mythdb.h"
 #include "mythverbose.h"
+#include "compat.h"
 
 QMutex MSqlQuery::prepareLock(false);
 
Index: libmythdb/libmythdb.pro
===================================================================
--- libmythdb/libmythdb.pro	(revision 17662)
+++ libmythdb/libmythdb.pro	(working copy)
@@ -46,3 +46,4 @@
 
 include ( ../libs-targetfix.pro )
 
+mingw:LIBS += -lpthread -lws2_32