using from .h to .cc
diff --git a/oss-internship-2020/libtiff/test/check_tag.cc b/oss-internship-2020/libtiff/test/check_tag.cc
index a18e0d6..821fab8 100644
--- a/oss-internship-2020/libtiff/test/check_tag.cc
+++ b/oss-internship-2020/libtiff/test/check_tag.cc
@@ -14,6 +14,10 @@
 
 #include "check_tag.h"  // NOLINT(build/include)
 
+using ::sapi::IsOk;
+using ::testing::Eq;
+using ::testing::IsTrue;
+
 void CheckShortField(TiffApi& api, sapi::v::RemotePtr& tif, const ttag_t field,
                      const uint16_t value) {
   sapi::v::UShort tmp(123);
diff --git a/oss-internship-2020/libtiff/test/defer_strile_writing.cc b/oss-internship-2020/libtiff/test/defer_strile_writing.cc
index 4c0e37f..726b24e 100644
--- a/oss-internship-2020/libtiff/test/defer_strile_writing.cc
+++ b/oss-internship-2020/libtiff/test/defer_strile_writing.cc
@@ -19,6 +19,11 @@
 
 namespace {
 
+using ::sapi::IsOk;
+using ::testing::Eq;
+using ::testing::IsTrue;
+using ::testing::NotNull;
+
 constexpr unsigned kTileBufferSize = 256;
 constexpr uint16_t kWidth = 1;
 constexpr uint16_t kBps = 8;
diff --git a/oss-internship-2020/libtiff/test/helper.h b/oss-internship-2020/libtiff/test/helper.h
index 589a150..5c920f8 100644
--- a/oss-internship-2020/libtiff/test/helper.h
+++ b/oss-internship-2020/libtiff/test/helper.h
@@ -22,11 +22,4 @@
 #include "sandboxed_api/sandbox2/util/temp_file.h"
 #include "sandboxed_api/util/status_matchers.h"
 
-using ::sapi::IsOk;
-using ::testing::Eq;
-using ::testing::IsFalse;
-using ::testing::IsTrue;
-using ::testing::Ne;
-using ::testing::NotNull;
-
 std::string GetFilePath(const std::string& filename);
diff --git a/oss-internship-2020/libtiff/test/long_tag.cc b/oss-internship-2020/libtiff/test/long_tag.cc
index 5ce5fc0..59198f9 100644
--- a/oss-internship-2020/libtiff/test/long_tag.cc
+++ b/oss-internship-2020/libtiff/test/long_tag.cc
@@ -19,6 +19,11 @@
 
 namespace {
 
+using ::sapi::IsOk;
+using ::testing::Ne;
+using ::testing::IsTrue;
+using ::testing::NotNull;
+
 struct LongTag {
   ttag_t tag;
   short count;
diff --git a/oss-internship-2020/libtiff/test/raw_decode.cc b/oss-internship-2020/libtiff/test/raw_decode.cc
index 74f1b7b..9086848 100644
--- a/oss-internship-2020/libtiff/test/raw_decode.cc
+++ b/oss-internship-2020/libtiff/test/raw_decode.cc
@@ -15,10 +15,15 @@
 #include <array>
 #include <cstring>
 
-#include "gtest/gtest.h"
 #include "helper.h"  // NOLINT(build/include)
 #include "tiffio.h"  // NOLINT(build/include)
 
+using ::sapi::IsOk;
+using ::testing::Eq;
+using ::testing::IsFalse;
+using ::testing::IsTrue;
+using ::testing::NotNull;
+
 namespace {
 
 struct ChannelLimits {
diff --git a/oss-internship-2020/libtiff/test/short_tag.cc b/oss-internship-2020/libtiff/test/short_tag.cc
index e84eb37..83bf1f8 100644
--- a/oss-internship-2020/libtiff/test/short_tag.cc
+++ b/oss-internship-2020/libtiff/test/short_tag.cc
@@ -20,6 +20,11 @@
 
 namespace {
 
+using ::sapi::IsOk;
+using ::testing::Ne;
+using ::testing::IsTrue;
+using ::testing::NotNull;
+
 constexpr unsigned kSamplePerPixel = 3;
 constexpr uint16_t kWidth = 1;
 constexpr uint16_t kLength = 1;