diff --git a/mingw-w64-headers/include/textstor.h b/mingw-w64-headers/include/textstor.h
index 6462eb3..6fdbeee 100644
--- a/mingw-w64-headers/include/textstor.h
+++ b/mingw-w64-headers/include/textstor.h
@@ -68,6 +68,22 @@
 
 #define TS_SD_LOADING (0x2)
 
+#define TS_SD_RESERVED (0x4)
+
+#define TS_SD_TKBAUTOCORRECTENABLE (0x8)
+
+#define TS_SD_TKBPREDICTIONENABLE (0x10)
+
+#define TS_SD_UIINTEGRATIONENABLE (0x20)
+
+#define TS_SD_INPUTPANEMANUALDISPLAYENABLE (0x40)
+
+#define TS_SD_EMBEDDEDHANDWRITINGVIEW_ENABLED (0x80)
+
+#define TS_SD_EMBEDDEDHANDWRITINGVIEW_VISIBLE (0x100)
+
+#define TS_SD_MASKALL (TS_SD_READONLY | TS_SD_LOADING)
+
 #define TS_SS_DISJOINTSEL (0x1)
 
 #define TS_SS_REGIONS (0x2)
@@ -76,6 +92,12 @@
 
 #define TS_SS_NOHIDDENTEXT (0x8)
 
+#define TS_SS_TKBAUTOCORRECTENABLE (0x10)
+
+#define TS_SS_TKBPREDICTIONENABLE (0x20)
+
+#define TS_SS_UWPCONTROL (0x40)
+
 #define TS_AS_TEXT_CHANGE (0x1)
 
 #define TS_AS_SEL_CHANGE (0x2)
diff --git a/mingw-w64-headers/include/textstor.idl b/mingw-w64-headers/include/textstor.idl
index 7640e8c..5aa1279 100644
--- a/mingw-w64-headers/include/textstor.idl
+++ b/mingw-w64-headers/include/textstor.idl
@@ -1,27 +1,19 @@
 /*
  * Copyright 2009 Aric Stewart, CodeWeavers
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of the mingw-w64 nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #ifndef DO_NO_IMPORTS
@@ -45,13 +37,25 @@
 
 const ULONG TS_DEFAULT_SELECTION = ~0u;
 
-const DWORD TS_SD_READONLY     = 0x001;
-const DWORD TS_SD_LOADING      = 0x002;
+const DWORD TS_SD_READONLY              = 0x001;
+const DWORD TS_SD_LOADING               = 0x002;
+const DWORD TS_SD_RESERVED              = 0x004;
+const DWORD TS_SD_TKBAUTOCORRECTENABLE  = 0x008;
+const DWORD TS_SD_TKBPREDICTIONENABLE   = 0x010;
+const DWORD TS_SD_UIINTEGRATIONENABLE   = 0x020;
+const DWORD TS_SD_INPUTPANEMANUALDISPLAYENABLE = 0x040;
+const DWORD TS_SD_EMBEDDEDHANDWRITINGVIEW_ENABLED = 0x080;
+const DWORD TS_SD_EMBEDDEDHANDWRITINGVIEW_VISIBLE = 0x100;
 
-const DWORD TS_SS_DISJOINTSEL  = 0x001;
-const DWORD TS_SS_REGIONS      = 0x002;
-const DWORD TS_SS_TRANSITORY   = 0x004;
-const DWORD TS_SS_NOHIDDENTEXT = 0x008;
+const DWORD TS_SD_MASKALL = (TS_SD_READONLY | TS_SD_LOADING);
+
+const DWORD TS_SS_DISJOINTSEL           = 0x001;
+const DWORD TS_SS_REGIONS               = 0x002;
+const DWORD TS_SS_TRANSITORY            = 0x004;
+const DWORD TS_SS_NOHIDDENTEXT          = 0x008;
+const DWORD TS_SS_TKBAUTOCORRECTENABLE  = 0x010;
+const DWORD TS_SS_TKBPREDICTIONENABLE   = 0x020;
+const DWORD TS_SS_UWPCONTROL            = 0x040;
 
 const DWORD TS_AS_TEXT_CHANGE      = 0x01;
 const DWORD TS_AS_SEL_CHANGE       = 0x02;
@@ -162,7 +166,7 @@
     HRESULT OnStartEditTransaction();
 
     HRESULT OnEndEditTransaction();
-};
+}
 
 [
   object,
@@ -319,4 +323,4 @@
     HRESULT GetWnd(
         [in] TsViewCookie vcView,
         [out] HWND *phwnd);
-};
+}
diff --git a/mingw-w64-headers/wine-import.sh b/mingw-w64-headers/wine-import.sh
index 425b9b9..3ca1f7b 100755
--- a/mingw-w64-headers/wine-import.sh
+++ b/mingw-w64-headers/wine-import.sh
@@ -208,6 +208,7 @@
 	rtworkq \
 	spatialaudioclient \
 	taskschd \
+	textstor \
 	thumbcache \
 	uiautomationclient \
 	uiautomationcore \
@@ -228,18 +229,18 @@
 	windows.gaming.input.forcefeedback \
 	windows.gaming.ui \
 	windows.globalization \
-        windows.graphics.capture \
-        windows.graphics.directx \
-        windows.graphics.directx.direct3d11 \
-        windows.graphics.effects \
-        windows.graphics.holographic \
+	windows.graphics.capture \
+	windows.graphics.directx \
+	windows.graphics.directx.direct3d11 \
+	windows.graphics.effects \
+	windows.graphics.holographic \
 	windows.media \
 	windows.media.closedcaptioning \
 	windows.media.devices \
 	windows.media.speechrecognition \
 	windows.media.speechsynthesis \
-        windows.perception.spatial \
-        windows.perception.spatial.surfaces \
+	windows.perception.spatial \
+	windows.perception.spatial.surfaces \
 	windows.security.credentials \
 	windows.security.cryptography \
 	windows.storage.streams \
@@ -249,8 +250,8 @@
 	windows.system.threading \
 	windows.system.userprofile \
 	windows.ui \
-        windows.ui.composition \
-        windows.ui.core \
+	windows.ui.composition \
+	windows.ui.core \
 	windows.ui.viewmanagement \
 	wmdrmsdk \
 	wmp \