diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt
index 9ad2e011c12..57e071d2ff6 100644
--- a/dll/win32/aclui/CMakeLists.txt
+++ b/dll/win32/aclui/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+spec2def(aclui.dll aclui.spec)
+
 set_unicode()
 
 add_definitions(-DSUPPORT_UXTHEME)
@@ -18,9 +20,7 @@ add_library(aclui SHARED
 
 set_module_type(aclui win32dll)
 
-set_export_spec(aclui aclui.spec aclui.dll)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
+add_importlib_target(aclui.spec)
 
 add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
 
diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt
index b3018db767b..db8cc669c41 100644
--- a/dll/win32/batt/CMakeLists.txt
+++ b/dll/win32/batt/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+spec2def(batt.dll batt.spec)
+
 set_unicode()
 
 add_library(batt SHARED
@@ -8,9 +10,7 @@ add_library(batt SHARED
 
 set_module_type(batt win32dll)
 
-set_export_spec(batt batt.spec)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def)
+add_importlib_target(batt.spec)
 
 add_importlibs(batt msvcrt kernel32)
 
diff --git a/gcc.cmake b/gcc.cmake
index 67a91b90dee..ddcc90a7837 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -224,6 +224,10 @@ macro(add_importlibs MODULE)
     endforeach()
 endmacro()
 
+if(NOT ARCH MATCHES i386)
+    set(DECO_OPTION "-@")
+endif()
+
 macro(add_importlib_target _exports_file)
 
     get_filename_component(_name ${_exports_file} NAME_WE)
@@ -236,10 +240,6 @@ macro(add_importlib_target _exports_file)
             set(DLLNAME_OPTION "")
         endif()
 
-        if(NOT ARCH MATCHES i386)
-            set(DECO_OPTION "-@")
-        endif()
-
         add_custom_command(
             OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
             COMMAND native-spec2def ${DLLNAME_OPTION} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
@@ -273,17 +273,6 @@ macro(spec2def _dllname _spec_file)
     list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
 endmacro()
 
-# Optional 3rd parameter: dllname
-macro(set_export_spec _module _spec_file)
-    get_filename_component(_file ${_spec_file} NAME_WE)
-    if (${ARGC} GREATER 2)
-        set(_dllname ${ARGV2})
-    else()
-        set(_dllname ${_file}.dll)
-    endif()
-    spec2def(${_dllname} ${_spec_file})
-endmacro()
-
 #pseh lib, needed with mingw
 set(PSEH_LIB "pseh")