diff --git a/configure b/configure
index efd7ffecde..8262358138 100755
--- a/configure
+++ b/configure
@@ -4957,7 +4957,7 @@ case $target_os in
     mingw32*|mingw64*)
         target_os=mingw32
         if enabled shared; then
-            # Cannot build both shared and static libs when using dllexport.
+            # Cannot build both shared and static libs when using dllimport.
             disable static
         fi
         enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index d47ce0e93d..d3310b6afe 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -414,12 +414,8 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
  */
 int64_t ff_guess_coded_bitrate(AVCodecContext *avctx);
 
-#if defined(_WIN32) && CONFIG_SHARED
-#ifdef BUILDING_avcodec
-#    define av_export_avcodec __declspec(dllexport)
-#else
+#if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avcodec)
 #    define av_export_avcodec __declspec(dllimport)
-#endif
 #else
 #    define av_export_avcodec
 #endif
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 72ae0ad89b..c77dfa7d3c 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -63,12 +63,8 @@
 #endif
 #endif
 
-#if defined(_WIN32) && CONFIG_SHARED
-#ifdef BUILDING_avutil
-#    define av_export_avutil __declspec(dllexport)
-#else
+#if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avutil)
 #    define av_export_avutil __declspec(dllimport)
-#endif
 #else
 #    define av_export_avutil
 #endif