From dd63a3a3aeb5efb457edd48cbc9429ebcc586b88 Mon Sep 17 00:00:00 2001
From: Michael Chirico <chiricom@google.com>
Date: Tue, 9 May 2023 11:52:23 -0700
Subject: [PATCH 1/2] Update file.cc

---
 src/file.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/file.cc b/src/file.cc
index 9b573704..c6dd5200 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -2,8 +2,6 @@
 #define __STDC_FORMAT_MACROS 1
 #endif
 
-#include <Rinternals.h>
-
 #include "getmode.h"
 #include "uv.h"
 
@@ -12,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include <Rinternals.h>
 #include "error.h"
 
 #ifndef __WIN32

From 3a28c1506a37bfddcb97003ed7023d81ebc8fa60 Mon Sep 17 00:00:00 2001
From: Michael Chirico <chiricom@google.com>
Date: Tue, 9 May 2023 11:54:30 -0700
Subject: [PATCH 2/2] Update id.cc

---
 src/id.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/id.cc b/src/id.cc
index a55cbb73..b239157b 100644
--- a/src/id.cc
+++ b/src/id.cc
@@ -1,8 +1,9 @@
-#include "utils.h"
-#include <Rinternals.h>
 #include <string>
 #include <vector>
 
+#include <Rinternals.h>
+#include "utils.h"
+
 #ifndef __WIN32
 #include <grp.h>
 #include <pwd.h>