diff --git a/mingw-w64-crt/lib64/comctl32.def b/mingw-w64-crt/lib-common/comctl32.def
similarity index 93%
rename from mingw-w64-crt/lib64/comctl32.def
rename to mingw-w64-crt/lib-common/comctl32.def
index 207caa6..6683f72 100644
--- a/mingw-w64-crt/lib64/comctl32.def
+++ b/mingw-w64-crt/lib-common/comctl32.def
@@ -1,9 +1,3 @@
-; 
-; Exports of file COMCTL32.dll
-;
-; Autogenerated by gen_exportdef
-; Written by Kai Tietz, 2007
-;
 LIBRARY COMCTL32.dll
 EXPORTS
 MenuHelp
@@ -13,6 +7,9 @@
 CreateStatusWindowA
 CreateToolbar
 CreateMappedBitmap
+DPA_LoadStream
+DPA_SaveStream
+DPA_Merge
 CreatePropertySheetPage
 MakeDragList
 LBItemFromPt
@@ -95,20 +92,28 @@
 Str_SetPtrW
 DSA_Create
 DSA_Destroy
+DSA_GetItem
 DSA_GetItemPtr
 DSA_InsertItem
+DSA_SetItem
+DSA_DeleteItem
 DSA_DeleteAllItems
 DPA_Create
 DPA_Destroy
+DPA_Grow
+DPA_Clone
 DPA_GetPtr
+DPA_GetPtrIndex
 DPA_InsertPtr
 DPA_SetPtr
 DPA_DeletePtr
 DPA_DeleteAllPtrs
 DPA_Sort
 DPA_Search
+DPA_CreateEx
 DPA_EnumCallback
 DPA_DestroyCallback
+DSA_EnumCallback
 DSA_DestroyCallback
 CreateMRUListW
 AddMRUStringW
diff --git a/mingw-w64-crt/libarm32/comctl32.def b/mingw-w64-crt/libarm32/comctl32.def
deleted file mode 100644
index 18afa7a..0000000
--- a/mingw-w64-crt/libarm32/comctl32.def
+++ /dev/null
@@ -1,185 +0,0 @@
-;
-; Definition file of COMCTL32.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
-LIBRARY "COMCTL32.dll"
-EXPORTS
-MenuHelp
-ShowHideMenuCtl
-GetEffectiveClientRect
-DrawStatusTextA
-CreateStatusWindowA
-CreateToolbar
-CreateMappedBitmap
-DPA_LoadStream
-DPA_SaveStream
-DPA_Merge
-CreatePropertySheetPage
-MakeDragList
-LBItemFromPt
-DrawInsert
-CreateUpDownControl
-InitCommonControls
-CreatePropertySheetPageA
-CreatePropertySheetPageW
-CreateStatusWindow
-CreateStatusWindowW
-CreateToolbarEx
-DestroyPropertySheetPage
-DrawStatusText
-DrawStatusTextW
-FlatSB_EnableScrollBar
-FlatSB_GetScrollInfo
-FlatSB_GetScrollPos
-FlatSB_GetScrollProp
-FlatSB_GetScrollRange
-FlatSB_SetScrollInfo
-FlatSB_SetScrollPos
-FlatSB_SetScrollProp
-FlatSB_SetScrollRange
-FlatSB_ShowScrollBar
-GetMUILanguage
-ImageList_Add
-ImageList_AddIcon
-ImageList_AddMasked
-ImageList_BeginDrag
-ImageList_Copy
-ImageList_Create
-ImageList_Destroy
-ImageList_DragEnter
-ImageList_DragLeave
-ImageList_DragMove
-ImageList_DragShowNolock
-ImageList_Draw
-ImageList_DrawEx
-ImageList_DrawIndirect
-ImageList_Duplicate
-ImageList_EndDrag
-ImageList_GetBkColor
-ImageList_GetDragImage
-ImageList_GetFlags
-ImageList_GetIcon
-ImageList_GetIconSize
-ImageList_GetImageCount
-ImageList_GetImageInfo
-ImageList_GetImageRect
-ImageList_LoadImage
-ImageList_LoadImageA
-ImageList_LoadImageW
-ImageList_Merge
-ImageList_Read
-ImageList_Remove
-ImageList_Replace
-ImageList_ReplaceIcon
-ImageList_SetBkColor
-ord_71 @71
-ord_72 @72
-ord_73 @73
-ord_74 @74
-ImageList_SetDragCursorImage
-ImageList_SetFilter
-ImageList_SetFlags
-ImageList_SetIconSize
-ImageList_SetImageCount
-ImageList_SetOverlayImage
-ImageList_Write
-InitCommonControlsEx
-InitMUILanguage
-InitializeFlatSB
-PropertySheet
-PropertySheetA
-PropertySheetW
-RegisterClassNameW
-UninitializeFlatSB
-_TrackMouseEvent
-ord_151 @151
-FreeMRUList
-ord_153 @153
-ord_154 @154
-ord_155 @155
-ord_156 @156
-ord_157 @157
-ord_163 @163
-ord_164 @164
-ord_167 @167
-ord_169 @169
-ord_233 @233
-ord_234 @234
-ord_235 @235
-Str_SetPtrW
-DSA_Create
-DSA_Destroy
-DSA_GetItem
-DSA_GetItemPtr
-DSA_InsertItem
-DSA_SetItem
-DSA_DeleteItem
-DSA_DeleteAllItems
-DPA_Create
-DPA_Destroy
-DPA_Grow
-DPA_Clone
-DPA_GetPtr
-DPA_GetPtrIndex
-DPA_InsertPtr
-DPA_SetPtr
-DPA_DeletePtr
-DPA_DeleteAllPtrs
-DPA_Sort
-DPA_Search
-DPA_CreateEx
-ord_341 @341
-ord_342 @342
-ord_350 @350
-ord_351 @351
-ord_352 @352
-ord_353 @353
-ord_354 @354
-ord_355 @355
-ord_356 @356
-ord_357 @357
-ord_358 @358
-ord_359 @359
-ord_360 @360
-ord_361 @361
-ord_362 @362
-ord_363 @363
-ord_364 @364
-ord_365 @365
-ord_366 @366
-ord_367 @367
-ord_368 @368
-ord_369 @369
-ord_372 @372
-ord_373 @373
-ord_374 @374
-ord_375 @375
-ord_376 @376
-ord_377 @377
-ord_382 @382
-ord_383 @383
-ord_384 @384
-DPA_EnumCallback
-DPA_DestroyCallback
-DSA_EnumCallback
-DSA_DestroyCallback
-ord_389 @389
-ord_390 @390
-CreateMRUListW
-AddMRUStringW
-ord_402 @402
-EnumMRUListW
-ord_404 @404
-SetWindowSubclass
-ord_411 @411
-RemoveWindowSubclass
-DefSubclassProc
-ord_414 @414
-ord_415 @415
-ord_416 @416
-ord_417 @417
-ord_418 @418
-ord_419 @419
-ord_420 @420
-ord_421 @421