3 files changed, 7 insertions, 8 deletions
diff --git a/webkit/glue/plugins/mozilla_extensions.cc b/webkit/glue/plugins/mozilla_extensions.cc
index 1809a30..377aef6 100644
--- a/webkit/glue/plugins/mozilla_extensions.cc
+++ b/webkit/glue/plugins/mozilla_extensions.cc
@@ -27,13 +27,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <windows.h>
-#include <Winhttp.h>
+#include "webkit/glue/plugins/mozilla_extensions.h"
 
 #include <algorithm>
 
-#include "webkit/glue/plugins/mozilla_extensions.h"
-
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
diff --git a/webkit/glue/plugins/mozilla_extensions.h b/webkit/glue/plugins/mozilla_extensions.h
index 737f9fe9..edaee05 100644
--- a/webkit/glue/plugins/mozilla_extensions.h
+++ b/webkit/glue/plugins/mozilla_extensions.h
@@ -27,10 +27,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef WEBKIT_GLUE_PLUGINS_MOZILLA_EXTENSIONS_H__
-#define WEBKIT_GLUE_PLUGINS_MOZILLA_EXTENSIONS_H__
+#ifndef WEBKIT_GLUE_PLUGINS_MOZILLA_EXTENSIONS_H_
+#define WEBKIT_GLUE_PLUGINS_MOZILLA_EXTENSIONS_H_
 
-#include <windows.h>
+#include <string>
 
 // Include npapi first to avoid definition clashes due to 
 // XP_WIN
@@ -121,4 +121,4 @@ class MozillaExtensionApi : public nsIServiceManager,
 
 } // namespace NPAPI
 
-#endif  // WEBKIT_GLUE_PLUGINS_MOZILLA_EXTENSIONS_H__
+#endif  // WEBKIT_GLUE_PLUGINS_MOZILLA_EXTENSIONS_H_
diff --git a/webkit/glue/plugins/plugin_data_stream.cc b/webkit/glue/plugins/plugin_data_stream.cc
index bb7ee0b..2eede7a 100644
--- a/webkit/glue/plugins/plugin_data_stream.cc
+++ b/webkit/glue/plugins/plugin_data_stream.cc
@@ -29,6 +29,8 @@
 
 #include "webkit/glue/plugins/plugin_data_stream.h"
 
+#include "base/logging.h"
+
 namespace NPAPI {
 
 PluginDataStream::PluginDataStream(PluginInstance *instance,