diff --git a/configure b/configure
index 4e7480670f..fe976fd1b4 100755
--- a/configure
+++ b/configure
@@ -1275,8 +1275,8 @@ THREADS_LIST='
 
 ATOMICS_LIST='
     atomics_gcc
-    atomics_win32
     atomics_suncc
+    atomics_win32
 '
 
 ARCH_LIST='
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 04dcdbbe1b..33f82ed8f1 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -114,9 +114,9 @@ OBJS += $(COMPAT_OBJS:%=../compat/%)
 
 SKIPHEADERS          = old_pix_fmts.h
 
+SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
 SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
 SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h
-SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
 SKIPHEADERS-$(CONFIG_OPENCL)           += opencl.h
 
 TESTPROGS = adler32                                                     \