Merge changes Id513b72a,I92cd0116,I62393b58,I90ac2224,I527f88ac am: 572791e027 am: 482dde3e03
am: 5fa85e35cb

Change-Id: Ia6d7889d34960a20734b66a42c611c18e10f0660
diff --git a/tests/pty_test.cpp b/tests/pty_test.cpp
index 9b5785a..74415d5 100644
--- a/tests/pty_test.cpp
+++ b/tests/pty_test.cpp
@@ -14,11 +14,17 @@
  * limitations under the License.
  */
 
+#include <pty.h>
+
 #include <gtest/gtest.h>
 
-#include <pty.h>
+#include <pthread.h>
 #include <sys/ioctl.h>
 
+#include <atomic>
+
+#include <android-base/file.h>
+
 #include "utils.h"
 
 TEST(pty, openpty) {