Index: trunk/dep/include/Makefile.am
===================================================================
--- trunk/dep/include/Makefile.am (revision 2)
+++ trunk/dep/include/Makefile.am (revision 17)
@@ -61,5 +61,4 @@
 	mysql/config-win.h \
 	mysql/errmsg.h \
-	mysql/libmysqld.def \
 	mysql/Libmysql.def \
 	mysql/m_ctype.h \
@@ -167,29 +166,30 @@
 #  Sockets header files for Win32 builds
 EXTRA_DIST += \
-	sockets\Base64.h \
-	sockets\CircularBuffer.h \
-	sockets\IFile.h \
-	sockets\Ipv4Address.h \
-	sockets\Ipv6Address.h \
-	sockets\ISocketHandler.h \
-	sockets\ListenSocket.h \
-	sockets\Mutex.h \
-	sockets\Parse.h \
-	sockets\RandomNumber.h \
-	sockets\ResolvServer.h \
-	sockets\ResolvSocket.h \
-	sockets\SctpSocket.h \
-	sockets\Socket.h \
-	sockets\socket_include.h \
-	sockets\SocketAddress.h \
-	sockets\SocketHandler.h \
-	sockets\sockets-config.h \
-	sockets\StdLog.h \
-	sockets\StdoutLog.h \
-	sockets\TcpSocket.h \
-	sockets\Thread.h \
-	sockets\UdpSocket.h \
-	sockets\Uid.h \
-	sockets\Utility.h
+	sockets/Base64.h \
+	sockets/Exception.h \
+	sockets/File.h \
+	sockets/IFile.h \
+	sockets/Ipv4Address.h \
+	sockets/Ipv6Address.h \
+	sockets/ISocketHandler.h \
+	sockets/ListenSocket.h \
+	sockets/Lock.h \
+	sockets/Mutex.h \
+	sockets/Parse.h \
+	sockets/ResolvServer.h \
+	sockets/ResolvSocket.h \
+	sockets/SctpSocket.h \
+	sockets/SocketAddress.h \
+	sockets/Socket.h \
+	sockets/SocketHandler.h \
+	sockets/socket_include.h \
+	sockets/sockets-config.h \
+	sockets/StdLog.h \
+	sockets/StdoutLog.h \
+	sockets/StreamSocket.h \
+	sockets/TcpSocket.h \
+	sockets/Thread.h \
+	sockets/UdpSocket.h \
+	sockets/Utility.h
 
 #  VLD header files for Win32 builds
Index: trunk/dep/lib/Makefile.am
===================================================================
--- trunk/dep/lib/Makefile.am (revision 2)
+++ trunk/dep/lib/Makefile.am (revision 17)
@@ -41,5 +41,5 @@
 	x64_Debug/libeay32.lib   \
 	x64_Debug/libmySQL.dll   \
-	x64_Debug/libmySQL.lib
+	x64_Debug/libmysql.lib
 
 # Release libraries for Win64 builds.
@@ -48,3 +48,4 @@
 	x64_release/libeay32.lib   \
 	x64_release/libmySQL.dll   \
-	x64_release/libmySQL.lib
+	x64_release/libmysql.lib
+