diff --git a/include/gpu/GrBackendSemaphore.h b/include/gpu/GrBackendSemaphore.h
index b7043bf..e961490 100644
--- a/include/gpu/GrBackendSemaphore.h
+++ b/include/gpu/GrBackendSemaphore.h
@@ -14,7 +14,7 @@
 #include "include/gpu/mtl/GrMtlTypes.h"
 #include "include/gpu/vk/GrVkTypes.h"
 #ifdef SK_DIRECT3D
-#include "include/gpu/d3d/GrD3DTypesMinimal.h"
+#include "include/private/GrD3DTypesMinimal.h"
 #endif
 
 /**
diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h
index 793a54e..6349bab 100644
--- a/include/gpu/GrBackendSurface.h
+++ b/include/gpu/GrBackendSurface.h
@@ -34,8 +34,7 @@
 #endif
 
 #ifdef SK_DIRECT3D
-#include "include/gpu/d3d/GrD3DTypesMinimal.h"
-#include "include/private/GrD3DTypesPriv.h"
+#include "include/private/GrD3DTypesMinimal.h"
 class GrD3DResourceState;
 #endif
 
diff --git a/include/gpu/d3d/GrD3DTypes.h b/include/gpu/d3d/GrD3DTypes.h
index 33c079d..f2a2165 100644
--- a/include/gpu/d3d/GrD3DTypes.h
+++ b/include/gpu/d3d/GrD3DTypes.h
@@ -22,7 +22,7 @@
 // prepared to rename those identifiers. Otherwise use GrD3DTypesMinimal.h.
 
 #include "include/core/SkRefCnt.h"
-#include "include/gpu/d3d/GrD3DTypesMinimal.h"
+#include "include/gpu/GrTypes.h"
 #include <d3d12.h>
 #include <dxgi1_4.h>
 
@@ -206,10 +206,10 @@
             , fProtected(isProtected) {}
 
     GrD3DTextureResourceInfo(const GrD3DTextureResourceInfo& info,
-                             GrD3DResourceStateEnum resourceState)
+                             D3D12_RESOURCE_STATES resourceState)
             : fResource(info.fResource)
             , fAlloc(info.fAlloc)
-            , fResourceState(static_cast<D3D12_RESOURCE_STATES>(resourceState))
+            , fResourceState(resourceState)
             , fFormat(info.fFormat)
             , fSampleCount(info.fSampleCount)
             , fLevelCount(info.fLevelCount)
diff --git a/include/gpu/d3d/GrD3DTypesMinimal.h b/include/gpu/d3d/GrD3DTypesMinimal.h
deleted file mode 100644
index 704113e..0000000
--- a/include/gpu/d3d/GrD3DTypesMinimal.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrD3DTypesMinimal_DEFINED
-#define GrD3DTypesMinimal_DEFINED
-
-// Minimal definitions of Direct3D types, without including d3d12.h
-
-#include <dxgiformat.h>
-
-#include <functional>
-#include "include/gpu/GrTypes.h"
-
-struct ID3D12Resource;
-typedef int GrD3DResourceStateEnum;
-struct GrD3DTextureResourceInfo;
-struct GrD3DFenceInfo;
-
-#endif
diff --git a/include/private/GrD3DTypesPriv.h b/include/private/GrD3DTypesMinimal.h
similarity index 83%
rename from include/private/GrD3DTypesPriv.h
rename to include/private/GrD3DTypesMinimal.h
index fa42afa..b28094e 100644
--- a/include/private/GrD3DTypesPriv.h
+++ b/include/private/GrD3DTypesMinimal.h
@@ -5,13 +5,22 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrD3DTypesPriv_DEFINED
-#define GrD3DTypesPriv_DEFINED
+#ifndef GrD3DTypesMinimal_DEFINED
+#define GrD3DTypesMinimal_DEFINED
+
+// Minimal definitions of Direct3D types, without including d3d12.h
 
 #include "include/core/SkRefCnt.h"
-#include "include/gpu/d3d/GrD3DTypesMinimal.h"
 
+#include <dxgiformat.h>
+
+#include "include/gpu/GrTypes.h"
+
+struct ID3D12Resource;
 class GrD3DResourceState;
+typedef int GrD3DResourceStateEnum;
+struct GrD3DTextureResourceInfo;
+struct GrD3DFenceInfo;
 
 // This struct is to used to store the the actual information about the Direct3D backend image on
 // GrBackendTexture and GrBackendRenderTarget. When a client calls getD3DTextureInfo on a