diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index 7c91023e6d6..52f93324601 100644
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -6188,20 +6188,6 @@ typedef LBN *PLBN;
 typedef ULONG VBN;
 typedef VBN *PVBN;
 
-#define FSRTL_COMMON_FCB_HEADER_LAYOUT \
-  CSHORT NodeTypeCode; \
-  CSHORT NodeByteSize; \
-  UCHAR Flags; \
-  UCHAR IsFastIoPossible; \
-  UCHAR Flags2; \
-  UCHAR Reserved:4; \
-  UCHAR Version:4; \
-  PERESOURCE Resource; \
-  PERESOURCE PagingIoResource; \
-  LARGE_INTEGER AllocationSize; \
-  LARGE_INTEGER FileSize; \
-  LARGE_INTEGER ValidDataLength;
-
 #define FSRTL_COMMON_FCB_HEADER_LAYOUT \
   CSHORT NodeTypeCode; \
   CSHORT NodeByteSize; \
@@ -6478,6 +6464,10 @@ DEFINE_GUID(GUID_ECP_OPLOCK_KEY, 0x48850596, 0x3050, 0x4be7, 0x98, 0x63, 0xfe, 0
 
 typedef PVOID PNOTIFY_SYNC;
 
+#if (NTDDI_VERSION >= NTDDI_WIN7)
+typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER;
+#endif
+
 typedef BOOLEAN
 (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) (
   IN PVOID NotifyContext,
@@ -8835,10 +8825,6 @@ extern NTKERNELAPI PUSHORT NlsOemLeadByteInfo;
 #endif
 #define NLS_MB_CODE_PAGE_TAG              NlsMbOemCodePageTag
 
-#if (NTDDI_VERSION >= NTDDI_WIN7)
-typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER;
-#endif
-
 #if (NTDDI_VERSION >= NTDDI_VISTA)
 
 typedef enum _NETWORK_OPEN_LOCATION_QUALIFIER {
diff --git a/reactos/include/xdk/fsrtltypes.h b/reactos/include/xdk/fsrtltypes.h
index cc678845be8..1075be3f7b0 100644
--- a/reactos/include/xdk/fsrtltypes.h
+++ b/reactos/include/xdk/fsrtltypes.h
@@ -283,6 +283,10 @@ DEFINE_GUID(GUID_ECP_OPLOCK_KEY, 0x48850596, 0x3050, 0x4be7, 0x98, 0x63, 0xfe, 0
 
 typedef PVOID PNOTIFY_SYNC;
 
+#if (NTDDI_VERSION >= NTDDI_WIN7)
+typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER;
+#endif
+
 typedef BOOLEAN
 (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) (
   IN PVOID NotifyContext,
diff --git a/reactos/include/xdk/ntifs.template.h b/reactos/include/xdk/ntifs.template.h
index d374331a2db..3a36176f2d5 100644
--- a/reactos/include/xdk/ntifs.template.h
+++ b/reactos/include/xdk/ntifs.template.h
@@ -1119,10 +1119,6 @@ extern NTKERNELAPI PUSHORT NlsOemLeadByteInfo;
 #endif
 #define NLS_MB_CODE_PAGE_TAG              NlsMbOemCodePageTag
 
-#if (NTDDI_VERSION >= NTDDI_WIN7)
-typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER;
-#endif
-
 #if (NTDDI_VERSION >= NTDDI_VISTA)
 
 typedef enum _NETWORK_OPEN_LOCATION_QUALIFIER {