8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873
Reviewed-by: serb
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp
index 7bbf0e6..6f705b5 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
* questions.
*/
-#include "awt.h"
#include "awt_ole.h"
#include "awt_DCHolder.h" // main symbols
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp
index 4aa6356..126e719 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp
@@ -23,18 +23,16 @@
* questions.
*/
-#include "awt.h"
#include <shlwapi.h>
#include <shellapi.h>
#include <memory.h>
#include "awt_DataTransferer.h"
-#include "awt_Toolkit.h"
#include "java_awt_dnd_DnDConstants.h"
#include "sun_awt_windows_WDropTargetContextPeer.h"
#include "awt_Container.h"
-#include "alloc.h"
#include "awt_ole.h"
+#include "awt_Toolkit.h"
#include "awt_DnDDT.h"
#include "awt_DnDDS.h"
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_ole.h b/src/java.desktop/windows/native/libawt/windows/awt_ole.h
index db54c64..4e07eec 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_ole.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_ole.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,10 @@
#ifndef AWT_OLE_H
#define AWT_OLE_H
-#include "awt.h"
#include <ole2.h>
#include <comdef.h>
#include <comutil.h>
+#include "awt.h"
#ifdef _DEBUG
#define _SUN_DEBUG
