diff --git a/bazel/glog.bzl b/bazel/glog.bzl
index c25a786..620c212 100644
--- a/bazel/glog.bzl
+++ b/bazel/glog.bzl
@@ -161,15 +161,12 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
         visibility = ["//visibility:public"],
         srcs = [
             ":config_h",
-            "src/base/commandlineflags.h",
             "src/base/googleinit.h",
-            "src/base/mutex.h",
             "src/demangle.cc",
             "src/demangle.h",
             "src/logging.cc",
             "src/raw_logging.cc",
             "src/signalhandler.cc",
-            "src/stacktrace.h",
             "src/stacktrace_generic-inl.h",
             "src/stacktrace_libunwind-inl.h",
             "src/stacktrace_powerpc-inl.h",
@@ -179,15 +176,18 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
             "src/symbolize.cc",
             "src/symbolize.h",
             "src/utilities.cc",
-            "src/utilities.h",
             "src/vlog_is_on.cc",
         ] + select({
             "@bazel_tools//src/conditions:windows": windows_only_srcs,
             "//conditions:default": [],
         }),
         hdrs = [
+            "src/base/commandlineflags.h",
+            "src/base/mutex.h",
             "src/glog/log_severity.h",
             "src/glog/platform.h",
+            "src/stacktrace.h",
+            "src/utilities.h",
             ":logging_h",
             ":raw_logging_h",
             ":stl_logging_h",
@@ -226,12 +226,13 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
             name = test_name + "_test",
             visibility = ["//visibility:public"],
             srcs = [
+                ":config_h",
                 "src/googletest.h",
                 "src/" + test_name + "_unittest.cc",
             ],
             defines = final_lib_defines,
             copts = final_lib_copts + test_only_copts,
-            deps = [
+            deps = gflags_deps + [
                 ":glog",
                 "@com_github_google_googletest//:gtest",
             ],