diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm
index 176fd3dbbac097926207fef7e54a6e3fdac1e87b..01c1b8e7faa7ae7cbe186d05fa930f0eb887a88a 100644
--- a/libavcodec/x86/ac3dsp.asm
+++ b/libavcodec/x86/ac3dsp.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/dct32.asm b/libavcodec/x86/dct32.asm
index 58ee8d343bf8f0396c2730c89593e7c6187c9eb0..53c24157cdbf7051225884b3ab5513c6c55b8625 100644
--- a/libavcodec/x86/dct32.asm
+++ b/libavcodec/x86/dct32.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA 32
diff --git a/libavcodec/x86/deinterlace.asm b/libavcodec/x86/deinterlace.asm
index 8681181977c6682a146ada3afae3f385d7c658af..f15b8ea3017469f162429339041404ebe1140f7e 100644
--- a/libavcodec/x86/deinterlace.asm
+++ b/libavcodec/x86/deinterlace.asm
@@ -20,7 +20,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm
index fcb1b6d53cea5d3dbd42ae21d897853c8cc0fa51..4b36ca828d3968ad7e4e18406f0b60b6cee10f48 100644
--- a/libavcodec/x86/dsputil.asm
+++ b/libavcodec/x86/dsputil.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/dsputilenc.asm b/libavcodec/x86/dsputilenc.asm
index b7078f10a9e82f240d70893ffb96d66fa9dcec18..39031cb06ac99fc99bfde5ccd9dc14c32332ef8d 100644
--- a/libavcodec/x86/dsputilenc.asm
+++ b/libavcodec/x86/dsputilenc.asm
@@ -21,7 +21,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;*****************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION .text
diff --git a/libavcodec/x86/fft.asm b/libavcodec/x86/fft.asm
index f05429820bc6c839f0abb06e725ce448bc8981e5..465c08b00b24062cc45aab80175ca119bb3f912b 100644
--- a/libavcodec/x86/fft.asm
+++ b/libavcodec/x86/fft.asm
@@ -28,7 +28,6 @@
 ; in blocks as conventient to the vector size.
 ; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively)
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 %if ARCH_X86_64
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm
index 46b7e85242d666c71632eafd1f8c4848dc9843d8..d59c43ba7a76eb93212358d0e97297ec1d2bb286 100644
--- a/libavcodec/x86/fmtconvert.asm
+++ b/libavcodec/x86/fmtconvert.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_TEXT
diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm
index 56b8e5656ac404fdd8ef698ccbf1d510cc46415f..46518839d582c0ff410ed5711812a102688ac63e 100644
--- a/libavcodec/x86/h264_chromamc.asm
+++ b/libavcodec/x86/h264_chromamc.asm
@@ -20,7 +20,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_chromamc_10bit.asm b/libavcodec/x86/h264_chromamc_10bit.asm
index bcdb27c176a8002dc9f570d4fb6a8273b25ced33..254c69f2ce3d46c8411988de4b647a8d6d53d419 100644
--- a/libavcodec/x86/h264_chromamc_10bit.asm
+++ b/libavcodec/x86/h264_chromamc_10bit.asm
@@ -22,7 +22,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm
index 940a8f77e18e2a678a0af2d491211f014469d4bb..103fb0d64e46654942038fe4a287a838250866a1 100644
--- a/libavcodec/x86/h264_deblock.asm
+++ b/libavcodec/x86/h264_deblock.asm
@@ -24,7 +24,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm
index 7b9316d2c0c00d582f09e662a2d170fee9724149..e7186130057854175a0ac22320a370ae0821b1fe 100644
--- a/libavcodec/x86/h264_deblock_10bit.asm
+++ b/libavcodec/x86/h264_deblock_10bit.asm
@@ -24,7 +24,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
index 68864a46d0ef8c77f7cc1a707c93e519b5a166b9..5ae32636df6f079047576f84a9dddc7c6f062d6a 100644
--- a/libavcodec/x86/h264_idct.asm
+++ b/libavcodec/x86/h264_idct.asm
@@ -26,7 +26,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;*****************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_idct_10bit.asm b/libavcodec/x86/h264_idct_10bit.asm
index 6afcee2840dd5dec1eef90c65c4b5c4c65fe834f..ad923f94f6a3b6f625c3040517e64cff5a0b5a61 100644
--- a/libavcodec/x86/h264_idct_10bit.asm
+++ b/libavcodec/x86/h264_idct_10bit.asm
@@ -22,7 +22,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm
index 7c6aa12dce2c2dace07b3bae2b1504a64eca1236..3a5a6d4ccde159a77e80309fe997aada7cd238d3 100644
--- a/libavcodec/x86/h264_intrapred.asm
+++ b/libavcodec/x86/h264_intrapred.asm
@@ -22,7 +22,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_intrapred_10bit.asm b/libavcodec/x86/h264_intrapred_10bit.asm
index c3f6dc43e3d7de8b227a5b1340370015b25ecbce..98c9118c796a21aa55822f3c6404f61fe275d753 100644
--- a/libavcodec/x86/h264_intrapred_10bit.asm
+++ b/libavcodec/x86/h264_intrapred_10bit.asm
@@ -22,7 +22,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/h264_qpel_10bit.asm b/libavcodec/x86/h264_qpel_10bit.asm
index f380cfc77bec6eaa8beea0ebde92e591f34a54ee..0a9c433b25d46bfb73446882c2322d3a6de2894a 100644
--- a/libavcodec/x86/h264_qpel_10bit.asm
+++ b/libavcodec/x86/h264_qpel_10bit.asm
@@ -22,7 +22,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA 32
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm
index c8779cccdcb682db00d406e546c6bfb8ec85a5e6..6fe9a40b63cf72bdf576be32162951c0c7f3f744 100644
--- a/libavcodec/x86/h264_weight.asm
+++ b/libavcodec/x86/h264_weight.asm
@@ -21,7 +21,7 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
+%include "x86util.asm"
 
 SECTION .text
 
diff --git a/libavcodec/x86/h264_weight_10bit.asm b/libavcodec/x86/h264_weight_10bit.asm
index 24386f882e944c7a4a49b60b6ff9b707c708e42e..b2228bb0a6ced53b3ae3d2713e8fe881469f0a19 100644
--- a/libavcodec/x86/h264_weight_10bit.asm
+++ b/libavcodec/x86/h264_weight_10bit.asm
@@ -22,7 +22,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA 32
diff --git a/libavcodec/x86/imdct36.asm b/libavcodec/x86/imdct36.asm
index 937a2cc416fb2cf184dd0c347a9eee6e96ec2155..633fcd9d5947101657a0c7610ca4452319e9ac62 100644
--- a/libavcodec/x86/imdct36.asm
+++ b/libavcodec/x86/imdct36.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "libavutil/x86/x86inc.asm"
 %include "libavutil/x86/x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm
index 970f3db6f10db396620025fce38a1d660b18671c..e0b387198fd3fb5647bac49012b80fbc1d017244 100644
--- a/libavcodec/x86/pngdsp.asm
+++ b/libavcodec/x86/pngdsp.asm
@@ -21,7 +21,6 @@
 ;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm
index bce36ac1fca194b9701f4e642d17a9e0039bd2a2..5b7b7fc821fed434d2620d5b2bdd7a7faef74256 100644
--- a/libavcodec/x86/proresdsp.asm
+++ b/libavcodec/x86/proresdsp.asm
@@ -21,7 +21,6 @@
 ;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 %define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
diff --git a/libavcodec/x86/rv34dsp.asm b/libavcodec/x86/rv34dsp.asm
index 78d8c92b0b9b9caad9d4cf6d2f10af790ae8b81a..d6a2897d48c5e2ad063363f3d8c36311543ee5b1 100644
--- a/libavcodec/x86/rv34dsp.asm
+++ b/libavcodec/x86/rv34dsp.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm
index 70c0c0400f508e168d0ddbcbad818972d1fd5079..834b12b9315ddbfd86f6c704e31efbc974c664cb 100644
--- a/libavcodec/x86/rv40dsp.asm
+++ b/libavcodec/x86/rv40dsp.asm
@@ -21,7 +21,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavcodec/x86/sbrdsp.asm b/libavcodec/x86/sbrdsp.asm
index 47cb3121404b76f074922a98c2563925ba82ef62..b10b424bb45935076f8fe2538fed7d0cb308c418 100644
--- a/libavcodec/x86/sbrdsp.asm
+++ b/libavcodec/x86/sbrdsp.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 ;SECTION_RODATA
diff --git a/libavcodec/x86/vc1dsp.asm b/libavcodec/x86/vc1dsp.asm
index ced2b5ba88c9ad2f5b7a4620b16a2bc168158245..0aa4cf48af09453f5825a9db2fb57f299e1bd2b5 100644
--- a/libavcodec/x86/vc1dsp.asm
+++ b/libavcodec/x86/vc1dsp.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 cextern pw_4
diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm
index 7a88892c11fbd191dec0c247e5c76a73eb7ec433..865f17624fc3ece15a68d6331c42043ed40009af 100644
--- a/libavcodec/x86/vp3dsp.asm
+++ b/libavcodec/x86/vp3dsp.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 ; MMX-optimized functions cribbed from the original VP3 source code.
diff --git a/libavcodec/x86/vp56dsp.asm b/libavcodec/x86/vp56dsp.asm
index d80680fbb5b091193bc153a922ed16818550f7ce..f89ec7f43a9b15428c8e01313b52eb6824bda4bc 100644
--- a/libavcodec/x86/vp56dsp.asm
+++ b/libavcodec/x86/vp56dsp.asm
@@ -20,7 +20,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 cextern pw_64
diff --git a/libavcodec/x86/vp8dsp.asm b/libavcodec/x86/vp8dsp.asm
index ab58e950316ba89b215fe32f595a57f13dbf1f75..b7355c4a119da1783f45d043eb7e51a6e8c21654 100644
--- a/libavcodec/x86/vp8dsp.asm
+++ b/libavcodec/x86/vp8dsp.asm
@@ -20,7 +20,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libavfilter/x86/hqdn3d.asm b/libavfilter/x86/hqdn3d.asm
index 7254194ac8649766d609b6ca324c8ca5e820de41..a84c7b7d5f0716b0509ee5a0cc6e39a22c8af3a1 100644
--- a/libavfilter/x86/hqdn3d.asm
+++ b/libavfilter/x86/hqdn3d.asm
@@ -18,7 +18,7 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
+%include "x86util.asm"
 
 SECTION .text
 
diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm
index 25166afff2c2beb879533ac9c11c06be6849e0f1..a1213a69d5807fe63705968eadd0719936904bc9 100644
--- a/libavresample/x86/audio_convert.asm
+++ b/libavresample/x86/audio_convert.asm
@@ -20,7 +20,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 %include "util.asm"
 
diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm
index 0c4a9bd3ad7b018c0089e9ea6ad878a4f444de18..13b364aac2d4f9b41d033d0a2da6311e916917f7 100644
--- a/libavresample/x86/audio_mix.asm
+++ b/libavresample/x86/audio_mix.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 %include "util.asm"
 
diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
index d2ac1f01dced12b560e66fde1f7fa55034810e6d..e739ebe31fb5b86b5ace24cbb5ecfdb4c7cc008b 100644
--- a/libavutil/x86/cpuid.asm
+++ b/libavutil/x86/cpuid.asm
@@ -21,7 +21,7 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
+%include "x86util.asm"
 
 SECTION .text
 
diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
index 5b9b444676a4bc8e0fb40a3d81201970cf2a294b..bbc9a8b5e22fa2d1641e24e2f5818046dd95a210 100644
--- a/libavutil/x86/float_dsp.asm
+++ b/libavutil/x86/float_dsp.asm
@@ -18,7 +18,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION .text
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index a5d89a187aa18515b5c90738a9873f010110649a..3aac639543873705e51f19314ff243dcf7d4e66b 100644
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -23,6 +23,8 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
+%include "x86inc.asm"
+
 %macro SBUTTERFLY 4
 %if avx_enabled == 0
     mova      m%4, m%2
diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm
index 66d88458bb0f1c485c56c02f47060a1ec52874da..5d10e230cf4b1b549d8d1e688f757c10a0715d7c 100644
--- a/libswscale/x86/input.asm
+++ b/libswscale/x86/input.asm
@@ -21,7 +21,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm
index 9b0b01253a7f34f8eac3797a5644c1b30cd55799..7a138d1a6530f2710ccc59fc385566f8fe4dfdca 100644
--- a/libswscale/x86/output.asm
+++ b/libswscale/x86/output.asm
@@ -20,7 +20,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA
diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm
index d56e253afa3e0277ca03aa118f3ab91c3fd7a904..3a36ee62ebec9c993fe262a71dc14d00033044d1 100644
--- a/libswscale/x86/scale.asm
+++ b/libswscale/x86/scale.asm
@@ -19,7 +19,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
 %include "x86util.asm"
 
 SECTION_RODATA