diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 4e3dfc9..445d591 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -894,7 +894,8 @@
 
 processed_defs += lib64/msvcrt.def lib64/msvcr80.def lib64/msvcr90.def lib64/msvcr90d.def \
 				  lib64/msvcr100.def lib64/msvcr110.def lib64/msvcr120.def lib64/msvcr120d.def \
-				  lib64/msvcr120_app.def lib64/msvcp120_app.def
+				  lib64/msvcr120_app.def lib64/msvcp120_app.def \
+				  lib64/clbcatq.def
 
 endif
 
@@ -1187,7 +1188,8 @@
 libarm32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
 libarm32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
 
-processed_defs += libarm32/msvcrt.def libarm32/msvcr80.def libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def libarm32/msvcr110.def
+processed_defs += libarm32/msvcrt.def libarm32/msvcr80.def libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def libarm32/msvcr110.def \
+				  libarm32/clbcatq.def
 
 endif
 
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 590f23f..051900e 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -198,7 +198,8 @@
 @LIB64_TRUE@@W32API_FALSE@	lib64/libmingwthrd.a
 @LIB64_TRUE@@W32API_FALSE@am__append_10 = lib64/msvcrt.def lib64/msvcr80.def lib64/msvcr90.def lib64/msvcr90d.def \
 @LIB64_TRUE@@W32API_FALSE@				  lib64/msvcr100.def lib64/msvcr110.def lib64/msvcr120.def lib64/msvcr120d.def \
-@LIB64_TRUE@@W32API_FALSE@				  lib64/msvcr120_app.def lib64/msvcp120_app.def
+@LIB64_TRUE@@W32API_FALSE@				  lib64/msvcr120_app.def lib64/msvcp120_app.def \
+@LIB64_TRUE@@W32API_FALSE@				  lib64/clbcatq.def
 
 @LIB64_TRUE@@W32API_FALSE@am__append_11 = lib64/libmsvcp60.a lib64/libmsvcr80.a lib64/libmsvcr90.a lib64/libmsvcr100.a lib64/libmsvcr90d.a \
 @LIB64_TRUE@@W32API_FALSE@			  lib64/libmsvcr110.a lib64/libmsvcr120.a lib64/libmsvcr120d.a lib64/libcrtdll.a \
@@ -219,7 +220,9 @@
 @LIBARM32_TRUE@@W32API_FALSE@	libarm32/libmingwex.a \
 @LIBARM32_TRUE@@W32API_FALSE@	libarm32/libmoldname.a \
 @LIBARM32_TRUE@@W32API_FALSE@	libarm32/libmingwthrd.a
-@LIBARM32_TRUE@@W32API_FALSE@am__append_14 = libarm32/msvcrt.def libarm32/msvcr80.def libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def libarm32/msvcr110.def
+@LIBARM32_TRUE@@W32API_FALSE@am__append_14 = libarm32/msvcrt.def libarm32/msvcr80.def libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def libarm32/msvcr110.def \
+@LIBARM32_TRUE@@W32API_FALSE@				  libarm32/clbcatq.def
+
 @LIBARM32_TRUE@@W32API_FALSE@am__append_15 = libarm32/libmsvcp60.a libarm32/libmsvcr110.a
 @ENABLE_TESTS_UNICODE_TRUE@am__append_16 = testcases/t_municode testcases/t_tmain
 check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_6)
diff --git a/mingw-w64-crt/lib64/clbcatq.def b/mingw-w64-crt/lib-common/clbcatq.def.in
similarity index 72%
rename from mingw-w64-crt/lib64/clbcatq.def
rename to mingw-w64-crt/lib-common/clbcatq.def.in
index a50196e..78b6981 100644
--- a/mingw-w64-crt/lib64/clbcatq.def
+++ b/mingw-w64-crt/lib-common/clbcatq.def.in
@@ -1,42 +1,38 @@
-; 
-; Exports of file CLBCatQ.DLL
-;
-; Autogenerated by gen_exportdef
-; Written by Kai Tietz, 2007
-;
+#include "func.def.in"
+
 LIBRARY CLBCatQ.DLL
 EXPORTS
 ActivatorUpdateForIsRouterChanges
 ; void __cdecl ClearList(class CStructArray * __ptr64)
-?ClearList@@YAXPEAVCStructArray@@@Z
+F_X64(?ClearList@@YAXPEAVCStructArray@@@Z)
 CoRegCleanup
 ; long __cdecl CreateComponentLibraryTS(unsigned short const * __ptr64,long,struct IComponentRecords * __ptr64 * __ptr64)
-?CreateComponentLibraryTS@@YAJPEBGJPEAPEAUIComponentRecords@@@Z
+F_X64(?CreateComponentLibraryTS@@YAJPEBGJPEAPEAUIComponentRecords@@@Z)
 ; long __cdecl DataConvert(unsigned short,unsigned short,unsigned long,unsigned long * __ptr64,void * __ptr64,void * __ptr64,unsigned long,unsigned long,unsigned long * __ptr64,unsigned char,unsigned char,unsigned long)
-?DataConvert@@YAJGGKPEAKPEAX1KK0EEK@Z
+F_X64(?DataConvert@@YAJGGKPEAKPEAX1KK0EEK@Z)
 DeleteAllActivatorsForClsid
 ; void __cdecl DestroyStgDatabase(class StgDatabase * __ptr64)
-?DestroyStgDatabase@@YAXPEAVStgDatabase@@@Z
+F_X64(?DestroyStgDatabase@@YAXPEAVStgDatabase@@@Z)
 DowngradeAPL
 ; long __cdecl GetDataConversion(struct IDataConvert * __ptr64 * __ptr64)
-?GetDataConversion@@YAJPEAPEAUIDataConvert@@@Z
+F_X64(?GetDataConversion@@YAJPEAPEAUIDataConvert@@@Z)
 ; class CGetDataConversion * __ptr64 __cdecl GetDataConvertObject(void)
-?GetDataConvertObject@@YAPEAVCGetDataConversion@@XZ
+F_X64(?GetDataConvertObject@@YAPEAVCGetDataConversion@@XZ)
 GetGlobalBabyJITEnabled
 ; long __cdecl GetPropValue(unsigned short,long * __ptr64,void * __ptr64,int,int * __ptr64,struct tagDBPROP & __ptr64)
-?GetPropValue@@YAJGPEAJPEAXHPEAHAEAUtagDBPROP@@@Z
+F_X64(?GetPropValue@@YAJGPEAJPEAXHPEAHAEAUtagDBPROP@@@Z)
 ; long __cdecl GetStgDatabase(class StgDatabase * __ptr64 * __ptr64)
-?GetStgDatabase@@YAJPEAPEAVStgDatabase@@@Z
+F_X64(?GetStgDatabase@@YAJPEAPEAVStgDatabase@@@Z)
 ; void __cdecl InitErrors(unsigned long * __ptr64)
-?InitErrors@@YAXPEAK@Z
+F_X64(?InitErrors@@YAXPEAK@Z)
 ; long __cdecl OpenComponentLibrarySharedTS(unsigned short const * __ptr64,unsigned short const * __ptr64,unsigned long,struct _SECURITY_ATTRIBUTES * __ptr64,long,struct IComponentRecords * __ptr64 * __ptr64)
-?OpenComponentLibrarySharedTS@@YAJPEBG0KPEAU_SECURITY_ATTRIBUTES@@JPEAPEAUIComponentRecords@@@Z
+F_X64(?OpenComponentLibrarySharedTS@@YAJPEBG0KPEAU_SECURITY_ATTRIBUTES@@JPEAPEAUIComponentRecords@@@Z)
 ; long __cdecl OpenComponentLibraryTS(unsigned short const * __ptr64,long,struct IComponentRecords * __ptr64 * __ptr64)
-?OpenComponentLibraryTS@@YAJPEBGJPEAPEAUIComponentRecords@@@Z
+F_X64(?OpenComponentLibraryTS@@YAJPEBGJPEAPEAUIComponentRecords@@@Z)
 ; long __cdecl PostError(long,...)
-?PostError@@YAJJZZ
+F_X64(?PostError@@YAJJZZ)
 ; void __cdecl ShutDownDataConversion(void)
-?ShutDownDataConversion@@YAXXZ
+F_X64(?ShutDownDataConversion@@YAXXZ)
 UpdateFromAppChange
 UpdateFromComponentChange
 CLSIDFromStringByBitness
diff --git a/mingw-w64-crt/libarm32/clbcatq.def b/mingw-w64-crt/libarm32/clbcatq.def
deleted file mode 100644
index a822d72..0000000
--- a/mingw-w64-crt/libarm32/clbcatq.def
+++ /dev/null
@@ -1,35 +0,0 @@
-;
-; Definition file of CLBCatQ.DLL
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
-LIBRARY "CLBCatQ.DLL"
-EXPORTS
-ActivatorUpdateForIsRouterChanges
-CoRegCleanup
-DeleteAllActivatorsForClsid
-DowngradeAPL
-GetGlobalBabyJITEnabled
-UpdateFromAppChange
-UpdateFromComponentChange
-CLSIDFromStringByBitness
-CheckMemoryGates
-ComPlusEnablePartitions
-ComPlusEnableRemoteAccess
-ComPlusMigrate
-ComPlusPartitionsEnabled
-ComPlusRemoteAccessEnabled
-CreateComponentLibraryEx
-GetCatalogObject
-GetCatalogObject2
-GetComputerObject
-GetSimpleTableDispenser
-InprocServer32FromString
-OpenComponentLibraryEx
-OpenComponentLibraryOnMemEx
-OpenComponentLibraryOnStreamEx
-ServerGetApplicationType
-SetSetupOpen
-SetSetupSave
-SetupOpen
-SetupSave