diff --git a/Gemfile b/Gemfile
index fc7c614a326..04267a48077 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ source "https://rubygems.org/"
 
 gem "mini_portile2", "~>2.5.0"
 
+gem 'jaro_winkler', '= 1.5.4', :github => 'jmarrec/jaro_winkler', :ref => 'f1ca425fdef06603e5c65b09c5b681f805e1e297'
 gem "concourse", "~>0.30", :group => [:development, :test]
 gem "hoe", "~>3.22", ">=3.22.1", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2", :group => [:development, :test]
diff --git a/ext/nokogiri/nokogiri.h b/ext/nokogiri/nokogiri.h
index 3237554835b..2dad57633bb 100644
--- a/ext/nokogiri/nokogiri.h
+++ b/ext/nokogiri/nokogiri.h
@@ -1,6 +1,18 @@
 #ifndef NOKOGIRI_NATIVE
 #define NOKOGIRI_NATIVE
 
+#if _MSC_VER
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif /* WIN32_LEAN_AND_MEAN */
+#ifndef WIN32
+#define WIN32
+#endif /* WIN32 */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>