From 9e7d2180c7ac60d4bec1c7a91f52dc765b39814c Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 26 Nov 2013 18:01:29 -0800
Subject: [PATCH] Switch ARM debuggerd over to <sys/user.h>.

Change-Id: I106d4e80a2e819f1d47ca81893340f567bb8b4d9
---
 debuggerd/arm/machine.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/debuggerd/arm/machine.c b/debuggerd/arm/machine.c
index 6bcd07e1b..4ab6026bf 100644
--- a/debuggerd/arm/machine.c
+++ b/debuggerd/arm/machine.c
@@ -15,18 +15,15 @@
 ** limitations under the License.
 */
 
-#include <stddef.h>
+#include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
 #include <sys/ptrace.h>
-
-#include <corkscrew/ptrace.h>
-
-#include <linux/user.h>
+#include <sys/types.h>
+#include <sys/user.h>
 
 #include "../utility.h"
 #include "../machine.h"