am 79fb7be4: am 1899628a: Merge "Switch ARM debuggerd over to <sys/user.h>."
* commit '79fb7be4f572297ea2c67d16f101e5e1d665f882':
Switch ARM debuggerd over to <sys/user.h>.
diff --git a/debuggerd/arm/machine.c b/debuggerd/arm/machine.c
index 6bcd07e..4ab6026 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"