From c9bf91049cf3c7f8282bf42cec6f847d0908cc9a Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 Feb 2018 01:34:25 -0500
Subject: [PATCH] all: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Backports commit d38ea87ac54af64ef611de434d07c12dc0399216 from qemu
---
 qemu/accel.c          | 1 +
 qemu/fpu/softfloat.c  | 3 +--
 qemu/ioport.c         | 1 +
 qemu/memory_mapping.c | 1 +
 qemu/qemu-log.c       | 1 +
 qemu/qemu-timer.c     | 1 +
 qemu/tcg-runtime.c    | 1 +
 qemu/translate-all.c  | 1 +
 8 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/qemu/accel.c b/qemu/accel.c
index be1e87a7..8cb3d51e 100644
--- a/qemu/accel.c
+++ b/qemu/accel.c
@@ -25,6 +25,7 @@
 
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
+#include "qemu/osdep.h"
 #include "sysemu/accel.h"
 #include "hw/boards.h"
 #include "qemu-common.h"
diff --git a/qemu/fpu/softfloat.c b/qemu/fpu/softfloat.c
index 86e5cc26..ba6599d2 100644
--- a/qemu/fpu/softfloat.c
+++ b/qemu/fpu/softfloat.c
@@ -82,12 +82,11 @@ this code that are retained.
 /* softfloat (and in particular the code in softfloat-specialize.h) is
  * target-dependent and needs the TARGET_* macros.
  */
-#include "config.h"
+#include "qemu/osdep.h"
 
 #include "fpu/softfloat.h"
 
 /* We only need stdlib for abort() */
-#include <stdlib.h>
 
 /*----------------------------------------------------------------------------
 | Primitive arithmetic functions, including multi-word arithmetic, and
diff --git a/qemu/ioport.c b/qemu/ioport.c
index 3a452ff9..6a38a511 100644
--- a/qemu/ioport.c
+++ b/qemu/ioport.c
@@ -27,6 +27,7 @@
 
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
+#include "qemu/osdep.h"
 #include "exec/ioport.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
diff --git a/qemu/memory_mapping.c b/qemu/memory_mapping.c
index c5a98533..e9bdd6e5 100644
--- a/qemu/memory_mapping.c
+++ b/qemu/memory_mapping.c
@@ -13,6 +13,7 @@
 
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
+#include "qemu/osdep.h"
 #include "glib_compat.h"
 
 #include "qemu-common.h"
diff --git a/qemu/qemu-log.c b/qemu/qemu-log.c
index 6198eb61..a8be9274 100644
--- a/qemu/qemu-log.c
+++ b/qemu/qemu-log.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/log.h"
 
diff --git a/qemu/qemu-timer.c b/qemu/qemu-timer.c
index 28e5121c..c9eae964 100644
--- a/qemu/qemu-timer.c
+++ b/qemu/qemu-timer.c
@@ -24,6 +24,7 @@
 
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 
 #include "hw/hw.h"
diff --git a/qemu/tcg-runtime.c b/qemu/tcg-runtime.c
index 21b022a5..9b52ce58 100644
--- a/qemu/tcg-runtime.c
+++ b/qemu/tcg-runtime.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "unicorn/platform.h"
 #include "qemu/host-utils.h"
 
diff --git a/qemu/translate-all.c b/qemu/translate-all.c
index e672dbaf..b550cb21 100644
--- a/qemu/translate-all.c
+++ b/qemu/translate-all.c
@@ -18,6 +18,7 @@
  */
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
+#include "qemu/osdep.h"
 #ifdef _WIN32
 #include <winsock2.h>
 #include <windows.h>