Patch Detail – Django REST framework

get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/patches/87372/?format=api

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 87372,
    "url": "https://patches.dpdk.org/api/patches/87372/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126213809.1479893-4-bruce.richardson@intel.com/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20210126213809.1479893-4-bruce.richardson@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20210126213809.1479893-4-bruce.richardson@intel.com",
    "date": "2021-01-26T21:38:04",
    "name": "[v5,3/8] ethdev: make driver-only headers private",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "55c9075ccfbf8072dd63abd6d4d16ee4515ab4ff",
    "submitter": {
        "id": 20,
        "url": "https://patches.dpdk.org/api/people/20/?format=api",
        "name": "Bruce Richardson",
        "email": "bruce.richardson@intel.com"
    },
    "delegate": {
        "id": 24651,
        "url": "https://patches.dpdk.org/api/users/24651/?format=api",
        "username": "dmarchand",
        "first_name": "David",
        "last_name": "Marchand",
        "email": "david.marchand@redhat.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210126213809.1479893-4-bruce.richardson@intel.com/mbox/",
    "series": [
        {
            "id": 14963,
            "url": "https://patches.dpdk.org/api/series/14963/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14963",
            "date": "2021-01-26T21:38:01",
            "name": "add checking of header includes",
            "version": 5,
            "mbox": "https://patches.dpdk.org/series/14963/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/87372/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/87372/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 2898EA052A;\n\tTue, 26 Jan 2021 22:38:53 +0100 (CET)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 03C09140D21;\n\tTue, 26 Jan 2021 22:38:53 +0100 (CET)",
            "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by mails.dpdk.org (Postfix) with ESMTP id E1279140D17\n for <dev@dpdk.org>; Tue, 26 Jan 2021 22:38:48 +0100 (CET)",
            "from fmsmga008.fm.intel.com ([10.253.24.58])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 26 Jan 2021 13:38:47 -0800",
            "from silpixa00399126.ir.intel.com ([10.237.222.4])\n by fmsmga008.fm.intel.com with ESMTP; 26 Jan 2021 13:38:31 -0800"
        ],
        "IronPort-SDR": [
            "\n iqnObpq5WBiiDW7WATE7SnlsxDvykpX8leixuOQfKEhYqJmAlr5rvolnj1FLlg7Jidib46AVsS\n I6gDbXDfUzaw==",
            "\n og6DZApNOZCUwFh0pwSdU3MjGkSqYX+xlaYfUgYMEz8CuKsagmZSk1IL+Cugmp/N6n8sVMDpHz\n ydGzna37soIg=="
        ],
        "X-IronPort-AV": [
            "E=McAfee;i=\"6000,8403,9876\"; a=\"180055781\"",
            "E=Sophos;i=\"5.79,377,1602572400\"; d=\"scan'208\";a=\"180055781\"",
            "E=Sophos;i=\"5.79,377,1602572400\"; d=\"scan'208\";a=\"362138748\""
        ],
        "X-ExtLoop1": "1",
        "From": "Bruce Richardson <bruce.richardson@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "david.marchand@redhat.com, Bruce Richardson <bruce.richardson@intel.com>,\n Chas Williams <chas3@att.com>, \"Min Hu (Connor)\" <humin29@huawei.com>,\n Reshma Pattan <reshma.pattan@intel.com>,\n Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@oss.nxp.com>,\n Nipun Gupta <nipun.gupta@nxp.com>, Jerin Jacob <jerinj@marvell.com>,\n \"John W. Linville\" <linville@tuxdriver.com>,\n Ciara Loftus <ciara.loftus@intel.com>, Qi Zhang <qi.z.zhang@intel.com>,\n Shepard Siegel <shepard.siegel@atomicrules.com>,\n Ed Czeck <ed.czeck@atomicrules.com>,\n John Miller <john.miller@atomicrules.com>,\n Igor Russkikh <igor.russkikh@aquantia.com>,\n Pavel Belous <pavel.belous@aquantia.com>,\n Steven Webster <steven.webster@windriver.com>,\n Matt Peters <matt.peters@windriver.com>,\n Somalapuram Amaranath <asomalap@amd.com>, Rasesh Mody <rmody@marvell.com>,\n Shahed Shaikh <shshaikh@marvell.com>,\n Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,\n Jeff Guo <jia.guo@intel.com>, Haiyue Wang <haiyue.wang@intel.com>,\n Marcin Wojtas <mw@semihalf.com>, Michal Krawczyk <mk@semihalf.com>,\n Guy Tzalik <gtzalik@amazon.com>, Evgeny Schemeilin <evgenys@amazon.com>,\n Igor Chauskin <igorch@amazon.com>, Gagandeep Singh <g.singh@nxp.com>,\n John Daley <johndale@cisco.com>, Hyong Youb Kim <hyonkim@cisco.com>,\n Konstantin Ananyev <konstantin.ananyev@intel.com>,\n Gaetan Rivet <grive@u256.net>, Xiao Wang <xiao.w.wang@intel.com>,\n Ziyang Xuan <xuanziyang2@huawei.com>,\n Xiaoyun Wang <cloud.wangxiaoyun@huawei.com>,\n Guoyang Zhou <zhouguoyang@huawei.com>,\n Yisen Zhuang <yisen.zhuang@huawei.com>, Lijun Ou <oulijun@huawei.com>,\n Beilei Xing <beilei.xing@intel.com>,\n David Christensen <drc@linux.vnet.ibm.com>,\n Ruifeng Wang <ruifeng.wang@arm.com>, Jingjing Wu <jingjing.wu@intel.com>,\n Qiming Yang <qiming.yang@intel.com>, Andrew Boyer <aboyer@pensando.io>,\n Rosen Xu <rosen.xu@intel.com>, Ferruh Yigit <ferruh.yigit@intel.com>,\n Shijith Thotton <sthotton@marvell.com>,\n Srisivasubramanian Srinivasan <srinivasan@marvell.com>,\n Jakub Grajciar <jgrajcia@cisco.com>, Matan Azrad <matan@nvidia.com>,\n Shahaf Shuler <shahafs@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>,\n Zyta Szpak <zr@semihalf.com>, Liron Himi <lironh@marvell.com>,\n Stephen Hemminger <sthemmin@microsoft.com>, Long Li <longli@microsoft.com>,\n Martin Spinler <spinler@cesnet.cz>,\n Heinrich Kuhn <heinrich.kuhn@netronome.com>,\n Tetsuya Mukawa <mtetsuyah@gmail.com>, Harman Kalra <hkalra@marvell.com>,\n Nithin Dabilpuram <ndabilpuram@marvell.com>,\n Kiran Kumar K <kirankumark@marvell.com>, Akhil Goyal <akhil.goyal@nxp.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Jasvinder Singh <jasvinder.singh@intel.com>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>,\n Keith Wiles <keith.wiles@intel.com>, Maciej Czekaj <mczekaj@marvell.com>,\n Jiawen Wu <jiawenwu@trustnetic.com>, Jian Wang <jianwang@trustnetic.com>,\n Maxime Coquelin <maxime.coquelin@redhat.com>,\n Chenbo Xia <chenbo.xia@intel.com>, Yong Wang <yongwang@vmware.com>,\n Thomas Monjalon <thomas@monjalon.net>, Ori Kam <orika@nvidia.com>",
        "Date": "Tue, 26 Jan 2021 21:38:04 +0000",
        "Message-Id": "<20210126213809.1479893-4-bruce.richardson@intel.com>",
        "X-Mailer": "git-send-email 2.27.0",
        "In-Reply-To": "<20210126213809.1479893-1-bruce.richardson@intel.com>",
        "References": "<20210114110606.21142-1-bruce.richardson@intel.com>\n <20210126213809.1479893-1-bruce.richardson@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v5 3/8] ethdev: make driver-only headers private",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "The rte_ethdev_driver.h, rte_ethdev_vdev.h and rte_ethdev_pci.h files are\nfor drivers only and should be a private to DPDK and not installed.\n\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\n---\n app/test/test_link_bonding.c                               | 2 +-\n app/test/test_pdump.c                                      | 2 +-\n app/test/virtual_pmd.c                                     | 2 +-\n drivers/bus/dpaa/dpaa_bus.c                                | 2 +-\n drivers/bus/dpaa/include/fman.h                            | 2 +-\n drivers/bus/fslmc/fslmc_bus.c                              | 2 +-\n drivers/bus/fslmc/fslmc_vfio.c                             | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c                   | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpci.c                   | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpio.c                   | 2 +-\n drivers/event/dpaa2/dpaa2_eventdev.c                       | 2 +-\n drivers/event/dpaa2/dpaa2_hw_dpcon.c                       | 2 +-\n drivers/event/octeontx/ssovf_evdev.c                       | 2 +-\n drivers/mempool/dpaa2/dpaa2_hw_mempool.c                   | 2 +-\n drivers/net/af_packet/rte_eth_af_packet.c                  | 4 ++--\n drivers/net/af_xdp/rte_eth_af_xdp.c                        | 4 ++--\n drivers/net/ark/ark_ethdev.c                               | 2 +-\n drivers/net/ark/ark_ethdev_rx.h                            | 2 +-\n drivers/net/ark/ark_ethdev_tx.h                            | 2 +-\n drivers/net/ark/ark_ext.h                                  | 2 +-\n drivers/net/ark/ark_global.h                               | 2 +-\n drivers/net/ark/ark_pktchkr.c                              | 2 +-\n drivers/net/ark/ark_pktgen.c                               | 2 +-\n drivers/net/atlantic/atl_ethdev.c                          | 2 +-\n drivers/net/atlantic/atl_rxtx.c                            | 2 +-\n drivers/net/atlantic/rte_pmd_atlantic.c                    | 2 +-\n drivers/net/avp/avp_ethdev.c                               | 4 ++--\n drivers/net/axgbe/axgbe_common.h                           | 2 +-\n drivers/net/bnx2x/bnx2x_ethdev.c                           | 2 +-\n drivers/net/bnx2x/bnx2x_ethdev.h                           | 2 +-\n drivers/net/bnxt/bnxt.h                                    | 2 +-\n drivers/net/bnxt/bnxt_ethdev.c                             | 4 ++--\n drivers/net/bnxt/bnxt_stats.h                              | 2 +-\n drivers/net/bnxt/rte_pmd_bnxt.c                            | 2 +-\n drivers/net/bonding/eth_bond_private.h                     | 2 +-\n drivers/net/bonding/rte_eth_bond_api.c                     | 2 +-\n drivers/net/bonding/rte_eth_bond_pmd.c                     | 4 ++--\n drivers/net/cxgbe/base/t4_hw.c                             | 2 +-\n drivers/net/cxgbe/base/t4vf_hw.c                           | 2 +-\n drivers/net/cxgbe/cxgbe_ethdev.c                           | 4 ++--\n drivers/net/cxgbe/cxgbe_main.c                             | 4 ++--\n drivers/net/cxgbe/cxgbevf_ethdev.c                         | 4 ++--\n drivers/net/cxgbe/cxgbevf_main.c                           | 4 ++--\n drivers/net/cxgbe/sge.c                                    | 2 +-\n drivers/net/dpaa/dpaa_ethdev.c                             | 2 +-\n drivers/net/dpaa/dpaa_ethdev.h                             | 2 +-\n drivers/net/dpaa/dpaa_rxtx.c                               | 2 +-\n drivers/net/dpaa2/base/dpaa2_hw_dpni.c                     | 2 +-\n drivers/net/dpaa2/dpaa2_ethdev.c                           | 2 +-\n drivers/net/dpaa2/dpaa2_rxtx.c                             | 2 +-\n drivers/net/e1000/em_ethdev.c                              | 4 ++--\n drivers/net/e1000/em_rxtx.c                                | 2 +-\n drivers/net/e1000/igb_ethdev.c                             | 4 ++--\n drivers/net/e1000/igb_flow.c                               | 4 ++--\n drivers/net/e1000/igb_pf.c                                 | 2 +-\n drivers/net/e1000/igb_rxtx.c                               | 2 +-\n drivers/net/ena/ena_ethdev.c                               | 4 ++--\n drivers/net/enetc/enetc_ethdev.c                           | 2 +-\n drivers/net/enic/enic_ethdev.c                             | 4 ++--\n drivers/net/enic/enic_flow.c                               | 2 +-\n drivers/net/enic/enic_fm_flow.c                            | 2 +-\n drivers/net/enic/enic_main.c                               | 2 +-\n drivers/net/enic/enic_res.c                                | 2 +-\n drivers/net/enic/enic_rxtx.c                               | 2 +-\n drivers/net/enic/enic_rxtx_vec_avx2.c                      | 2 +-\n drivers/net/enic/enic_vf_representor.c                     | 4 ++--\n drivers/net/failsafe/failsafe.c                            | 4 ++--\n drivers/net/failsafe/failsafe_ops.c                        | 2 +-\n drivers/net/failsafe/failsafe_private.h                    | 2 +-\n drivers/net/failsafe/failsafe_rxtx.c                       | 2 +-\n drivers/net/fm10k/fm10k_ethdev.c                           | 4 ++--\n drivers/net/fm10k/fm10k_rxtx.c                             | 2 +-\n drivers/net/fm10k/fm10k_rxtx_vec.c                         | 2 +-\n drivers/net/hinic/base/hinic_pmd_hwdev.c                   | 2 +-\n drivers/net/hinic/hinic_pmd_ethdev.c                       | 2 +-\n drivers/net/hinic/hinic_pmd_ethdev.h                       | 2 +-\n drivers/net/hns3/hns3_cmd.c                                | 2 +-\n drivers/net/hns3/hns3_ethdev.c                             | 2 +-\n drivers/net/hns3/hns3_ethdev.h                             | 2 +-\n drivers/net/hns3/hns3_ethdev_vf.c                          | 2 +-\n drivers/net/hns3/hns3_fdir.c                               | 2 +-\n drivers/net/hns3/hns3_mbx.c                                | 2 +-\n drivers/net/hns3/hns3_mp.c                                 | 2 +-\n drivers/net/hns3/hns3_regs.c                               | 2 +-\n drivers/net/hns3/hns3_rxtx.c                               | 2 +-\n drivers/net/hns3/hns3_rxtx_vec.c                           | 2 +-\n drivers/net/hns3/hns3_rxtx_vec_sve.c                       | 2 +-\n drivers/net/i40e/i40e_ethdev.c                             | 4 ++--\n drivers/net/i40e/i40e_ethdev_vf.c                          | 4 ++--\n drivers/net/i40e/i40e_fdir.c                               | 2 +-\n drivers/net/i40e/i40e_flow.c                               | 2 +-\n drivers/net/i40e/i40e_pf.c                                 | 2 +-\n drivers/net/i40e/i40e_rxtx.c                               | 2 +-\n drivers/net/i40e/i40e_rxtx_vec_altivec.c                   | 2 +-\n drivers/net/i40e/i40e_rxtx_vec_avx2.c                      | 2 +-\n drivers/net/i40e/i40e_rxtx_vec_avx512.c                    | 2 +-\n drivers/net/i40e/i40e_rxtx_vec_common.h                    | 2 +-\n drivers/net/i40e/i40e_rxtx_vec_neon.c                      | 2 +-\n drivers/net/i40e/i40e_rxtx_vec_sse.c                       | 2 +-\n drivers/net/i40e/i40e_vf_representor.c                     | 2 +-\n drivers/net/iavf/iavf_ethdev.c                             | 4 ++--\n drivers/net/iavf/iavf_fdir.c                               | 2 +-\n drivers/net/iavf/iavf_generic_flow.c                       | 2 +-\n drivers/net/iavf/iavf_hash.c                               | 2 +-\n drivers/net/iavf/iavf_rxtx.c                               | 2 +-\n drivers/net/iavf/iavf_rxtx_vec_common.h                    | 2 +-\n drivers/net/iavf/iavf_rxtx_vec_sse.c                       | 2 +-\n drivers/net/iavf/iavf_vchnl.c                              | 4 ++--\n drivers/net/ice/ice_acl_filter.c                           | 2 +-\n drivers/net/ice/ice_dcf.c                                  | 4 ++--\n drivers/net/ice/ice_dcf.h                                  | 2 +-\n drivers/net/ice/ice_dcf_ethdev.c                           | 2 +-\n drivers/net/ice/ice_ethdev.c                               | 2 +-\n drivers/net/ice/ice_ethdev.h                               | 2 +-\n drivers/net/ice/ice_generic_flow.c                         | 2 +-\n drivers/net/ice/ice_hash.c                                 | 2 +-\n drivers/net/ice/ice_rxtx.c                                 | 2 +-\n drivers/net/ice/ice_switch_filter.c                        | 2 +-\n drivers/net/igc/igc_ethdev.c                               | 4 ++--\n drivers/net/igc/igc_filter.h                               | 2 +-\n drivers/net/igc/igc_txrx.c                                 | 2 +-\n drivers/net/ionic/ionic_ethdev.c                           | 4 ++--\n drivers/net/ionic/ionic_lif.c                              | 2 +-\n drivers/net/ionic/ionic_rxtx.c                             | 2 +-\n drivers/net/ipn3ke/ipn3ke_ethdev.c                         | 2 +-\n drivers/net/ipn3ke/ipn3ke_ethdev.h                         | 4 ++--\n drivers/net/ipn3ke/ipn3ke_flow.c                           | 2 +-\n drivers/net/ipn3ke/ipn3ke_representor.c                    | 2 +-\n drivers/net/ipn3ke/ipn3ke_tm.c                             | 2 +-\n drivers/net/ixgbe/ixgbe_bypass.c                           | 2 +-\n drivers/net/ixgbe/ixgbe_ethdev.c                           | 4 ++--\n drivers/net/ixgbe/ixgbe_fdir.c                             | 2 +-\n drivers/net/ixgbe/ixgbe_flow.c                             | 2 +-\n drivers/net/ixgbe/ixgbe_ipsec.c                            | 4 ++--\n drivers/net/ixgbe/ixgbe_pf.c                               | 2 +-\n drivers/net/ixgbe/ixgbe_rxtx.c                             | 2 +-\n drivers/net/ixgbe/ixgbe_rxtx_vec_common.h                  | 2 +-\n drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c                    | 2 +-\n drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c                     | 2 +-\n drivers/net/ixgbe/ixgbe_vf_representor.c                   | 2 +-\n drivers/net/ixgbe/rte_pmd_ixgbe.c                          | 2 +-\n drivers/net/kni/rte_eth_kni.c                              | 4 ++--\n drivers/net/liquidio/base/lio_23xx_vf.c                    | 2 +-\n drivers/net/liquidio/base/lio_mbox.c                       | 2 +-\n drivers/net/liquidio/lio_ethdev.c                          | 4 ++--\n drivers/net/liquidio/lio_rxtx.c                            | 2 +-\n drivers/net/memif/memif_socket.c                           | 4 ++--\n drivers/net/memif/rte_eth_memif.c                          | 4 ++--\n drivers/net/memif/rte_eth_memif.h                          | 2 +-\n drivers/net/mlx4/mlx4.c                                    | 4 ++--\n drivers/net/mlx4/mlx4.h                                    | 2 +-\n drivers/net/mlx4/mlx4_ethdev.c                             | 2 +-\n drivers/net/mlx4/mlx4_flow.c                               | 2 +-\n drivers/net/mlx4/mlx4_flow.h                               | 2 +-\n drivers/net/mlx4/mlx4_intr.c                               | 2 +-\n drivers/net/mlx4/mlx4_mp.c                                 | 2 +-\n drivers/net/mlx4/mlx4_rxq.c                                | 2 +-\n drivers/net/mlx4/mlx4_rxtx.h                               | 2 +-\n drivers/net/mlx4/mlx4_txq.c                                | 2 +-\n drivers/net/mlx5/linux/mlx5_ethdev_os.c                    | 2 +-\n drivers/net/mlx5/linux/mlx5_mp_os.c                        | 2 +-\n drivers/net/mlx5/linux/mlx5_os.c                           | 4 ++--\n drivers/net/mlx5/linux/mlx5_verbs.c                        | 2 +-\n drivers/net/mlx5/linux/mlx5_vlan_os.c                      | 2 +-\n drivers/net/mlx5/mlx5.c                                    | 4 ++--\n drivers/net/mlx5/mlx5.h                                    | 2 +-\n drivers/net/mlx5/mlx5_defs.h                               | 2 +-\n drivers/net/mlx5/mlx5_ethdev.c                             | 2 +-\n drivers/net/mlx5/mlx5_flow.c                               | 2 +-\n drivers/net/mlx5/mlx5_flow_dv.c                            | 2 +-\n drivers/net/mlx5/mlx5_flow_verbs.c                         | 2 +-\n drivers/net/mlx5/mlx5_mac.c                                | 2 +-\n drivers/net/mlx5/mlx5_rss.c                                | 2 +-\n drivers/net/mlx5/mlx5_rxmode.c                             | 2 +-\n drivers/net/mlx5/mlx5_rxq.c                                | 2 +-\n drivers/net/mlx5/mlx5_stats.c                              | 2 +-\n drivers/net/mlx5/mlx5_trigger.c                            | 2 +-\n drivers/net/mlx5/mlx5_txpp.c                               | 2 +-\n drivers/net/mlx5/mlx5_txq.c                                | 2 +-\n drivers/net/mlx5/mlx5_vlan.c                               | 2 +-\n drivers/net/mlx5/windows/mlx5_ethdev_os.c                  | 2 +-\n drivers/net/mlx5/windows/mlx5_mp_os.c                      | 2 +-\n drivers/net/mlx5/windows/mlx5_os.c                         | 2 +-\n drivers/net/mlx5/windows/mlx5_vlan_os.c                    | 2 +-\n drivers/net/mvneta/mvneta_ethdev.c                         | 2 +-\n drivers/net/mvpp2/mrvl_ethdev.c                            | 2 +-\n drivers/net/netvsc/hn_ethdev.c                             | 2 +-\n drivers/net/netvsc/hn_rndis.c                              | 2 +-\n drivers/net/netvsc/hn_vf.c                                 | 2 +-\n drivers/net/nfb/nfb_ethdev.c                               | 2 +-\n drivers/net/nfb/nfb_tx.h                                   | 2 +-\n drivers/net/nfp/nfp_net.c                                  | 4 ++--\n drivers/net/nfp/nfpcore/nfp_cpp.h                          | 2 +-\n drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c                 | 2 +-\n drivers/net/nfp/nfpcore/nfp_cppcore.c                      | 2 +-\n drivers/net/null/rte_eth_null.c                            | 4 ++--\n drivers/net/octeontx/octeontx_ethdev.h                     | 2 +-\n drivers/net/octeontx/octeontx_rxtx.c                       | 2 +-\n drivers/net/octeontx/octeontx_rxtx.h                       | 2 +-\n drivers/net/octeontx2/otx2_ethdev.c                        | 2 +-\n drivers/net/octeontx2/otx2_link.c                          | 2 +-\n drivers/net/octeontx2/otx2_ptp.c                           | 2 +-\n drivers/net/pcap/rte_eth_pcap.c                            | 4 ++--\n drivers/net/pfe/pfe_eth.h                                  | 2 +-\n drivers/net/pfe/pfe_ethdev.c                               | 2 +-\n drivers/net/qede/qede_ethdev.h                             | 4 ++--\n drivers/net/ring/rte_eth_ring.c                            | 2 +-\n drivers/net/sfc/sfc.h                                      | 2 +-\n drivers/net/sfc/sfc_dp_rx.h                                | 2 +-\n drivers/net/sfc/sfc_dp_tx.h                                | 2 +-\n drivers/net/sfc/sfc_ethdev.c                               | 4 ++--\n drivers/net/sfc/sfc_ev.h                                   | 2 +-\n drivers/net/sfc/sfc_flow.c                                 | 2 +-\n drivers/net/sfc/sfc_rx.h                                   | 2 +-\n drivers/net/sfc/sfc_tx.h                                   | 2 +-\n drivers/net/softnic/rte_eth_softnic.c                      | 4 ++--\n drivers/net/softnic/rte_eth_softnic_internals.h            | 2 +-\n drivers/net/szedata2/rte_eth_szedata2.c                    | 4 ++--\n drivers/net/tap/rte_eth_tap.c                              | 4 ++--\n drivers/net/tap/rte_eth_tap.h                              | 2 +-\n drivers/net/thunderx/nicvf_ethdev.c                        | 4 ++--\n drivers/net/thunderx/nicvf_ethdev.h                        | 2 +-\n drivers/net/thunderx/nicvf_rxtx.c                          | 2 +-\n drivers/net/thunderx/nicvf_rxtx.h                          | 2 +-\n drivers/net/thunderx/nicvf_struct.h                        | 2 +-\n drivers/net/txgbe/txgbe_ethdev.c                           | 2 +-\n drivers/net/txgbe/txgbe_ipsec.c                            | 2 +-\n drivers/net/txgbe/txgbe_pf.c                               | 2 +-\n drivers/net/txgbe/txgbe_rxtx.c                             | 2 +-\n drivers/net/vhost/rte_eth_vhost.c                          | 4 ++--\n drivers/net/virtio/virtio_ethdev.c                         | 4 ++--\n drivers/net/virtio/virtio_pci.h                            | 2 +-\n drivers/net/virtio/virtio_rxtx.c                           | 2 +-\n drivers/net/virtio/virtio_rxtx_simple.c                    | 2 +-\n drivers/net/virtio/virtio_rxtx_simple_altivec.c            | 2 +-\n drivers/net/virtio/virtio_rxtx_simple_neon.c               | 2 +-\n drivers/net/virtio/virtio_rxtx_simple_sse.c                | 2 +-\n drivers/net/virtio/virtio_user_ethdev.c                    | 2 +-\n drivers/net/vmxnet3/vmxnet3_ethdev.c                       | 4 ++--\n drivers/net/vmxnet3/vmxnet3_rxtx.c                         | 2 +-\n lib/librte_ethdev/{rte_ethdev_driver.h => ethdev_driver.h} | 0\n lib/librte_ethdev/{rte_ethdev_pci.h => ethdev_pci.h}       | 2 +-\n lib/librte_ethdev/ethdev_private.c                         | 2 +-\n lib/librte_ethdev/{rte_ethdev_vdev.h => ethdev_vdev.h}     | 2 +-\n lib/librte_ethdev/meson.build                              | 3 ---\n lib/librte_ethdev/rte_class_eth.c                          | 2 +-\n lib/librte_ethdev/rte_ethdev.c                             | 2 +-\n lib/librte_ethdev/rte_ethdev.h                             | 2 +-\n lib/librte_ethdev/rte_flow_driver.h                        | 2 +-\n lib/librte_ethdev/rte_mtr_driver.h                         | 2 +-\n lib/librte_ethdev/rte_tm_driver.h                          | 2 +-\n 251 files changed, 295 insertions(+), 298 deletions(-)\n rename lib/librte_ethdev/{rte_ethdev_driver.h => ethdev_driver.h} (100%)\n rename lib/librte_ethdev/{rte_ethdev_pci.h => ethdev_pci.h} (99%)\n rename lib/librte_ethdev/{rte_ethdev_vdev.h => ethdev_vdev.h} (97%)",
    "diff": "diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c\nindex e8b76bd850..8a5c8310a8 100644\n--- a/app/test/test_link_bonding.c\n+++ b/app/test/test_link_bonding.c\n@@ -17,7 +17,7 @@\n #include <rte_common.h>\n #include <rte_debug.h>\n #include <rte_ethdev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_lcore.h>\n #include <rte_memory.h>\ndiff --git a/app/test/test_pdump.c b/app/test/test_pdump.c\nindex 21fcc1bc4c..b49fcfb3f1 100644\n--- a/app/test/test_pdump.c\n+++ b/app/test/test_pdump.c\n@@ -6,7 +6,7 @@\n #include <stdint.h>\n #include <limits.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_pdump.h>\n #include \"rte_eal.h\"\n #include \"rte_lcore.h\"\ndiff --git a/app/test/virtual_pmd.c b/app/test/virtual_pmd.c\nindex 2c24c9b3f5..7036f401ed 100644\n--- a/app/test/virtual_pmd.c\n+++ b/app/test/virtual_pmd.c\n@@ -4,7 +4,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_ethdev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c\nindex f39d6e2092..662cbfaae5 100644\n--- a/drivers/bus/dpaa/dpaa_bus.c\n+++ b/drivers/bus/dpaa/dpaa_bus.c\n@@ -27,7 +27,7 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_ring.h>\n #include <rte_bus.h>\ndiff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h\nindex f2b0bf91e7..516c6c1515 100644\n--- a/drivers/bus/dpaa/include/fman.h\n+++ b/drivers/bus/dpaa/include/fman.h\n@@ -12,7 +12,7 @@\n #include <stdbool.h>\n #include <net/if.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n \n #include <compat.h>\ndiff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c\nindex 58435589b2..26910ac01f 100644\n--- a/drivers/bus/fslmc/fslmc_bus.c\n+++ b/drivers/bus/fslmc/fslmc_bus.c\n@@ -13,7 +13,7 @@\n #include <rte_malloc.h>\n #include <rte_devargs.h>\n #include <rte_memcpy.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_mbuf_dyn.h>\n \n #include <rte_fslmc.h>\ndiff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex b52f36c33e..c8373e627a 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -22,7 +22,7 @@\n \n #include <eal_filesystem.h>\n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\nindex d9619848d8..122aa1740d 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n@@ -19,7 +19,7 @@\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_mbuf_pool_ops.h>\n \n #include <fslmc_logs.h>\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\nindex d393ce6186..8ed969c7c0 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n@@ -18,7 +18,7 @@\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include <fslmc_logs.h>\n #include <rte_fslmc.h>\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\nindex 1a9dd18b99..c6f8312a1d 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n@@ -24,7 +24,7 @@\n #include<sys/eventfd.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c\nindex eeb2494bd0..e4fa3a2e46 100644\n--- a/drivers/event/dpaa2/dpaa2_eventdev.c\n+++ b/drivers/event/dpaa2/dpaa2_eventdev.c\n@@ -24,7 +24,7 @@\n #include <rte_memory.h>\n #include <rte_pci.h>\n #include <rte_bus_vdev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_cryptodev.h>\n #include <rte_event_eth_rx_adapter.h>\n #include <rte_event_eth_tx_adapter.h>\ndiff --git a/drivers/event/dpaa2/dpaa2_hw_dpcon.c b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\nindex 200b71640b..acc1fde771 100644\n--- a/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n+++ b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n@@ -18,7 +18,7 @@\n #include <rte_cycles.h>\n #include <rte_kvargs.h>\n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include <rte_fslmc.h>\n #include <mc/fsl_dpcon.h>\ndiff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c\nindex e60a7dc69e..17325bbf6a 100644\n--- a/drivers/event/octeontx/ssovf_evdev.c\n+++ b/drivers/event/octeontx/ssovf_evdev.c\n@@ -8,7 +8,7 @@\n #include <rte_debug.h>\n #include <rte_dev.h>\n #include <rte_eal.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_event_eth_rx_adapter.h>\n #include <rte_kvargs.h>\n #include <rte_lcore.h>\ndiff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\nindex 97ce08d78f..ca49a8d42a 100644\n--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\n+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\n@@ -14,7 +14,7 @@\n #include <errno.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c\nindex 671ee87ae2..bfe5a0a451 100644\n--- a/drivers/net/af_packet/rte_eth_af_packet.c\n+++ b/drivers/net/af_packet/rte_eth_af_packet.c\n@@ -8,8 +8,8 @@\n \n #include <rte_string_fns.h>\n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_kvargs.h>\n #include <rte_bus_vdev.h>\ndiff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c\nindex 703b7417ed..b8d5ad0d91 100644\n--- a/drivers/net/af_xdp/rte_eth_af_xdp.c\n+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c\n@@ -19,8 +19,8 @@\n #include <bpf/xsk.h>\n \n #include <rte_ethdev.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_kvargs.h>\n #include <rte_bus_vdev.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c\nindex a658993512..ef650a4658 100644\n--- a/drivers/net/ark/ark_ethdev.c\n+++ b/drivers/net/ark/ark_ethdev.c\n@@ -7,7 +7,7 @@\n #include <dlfcn.h>\n \n #include <rte_bus_pci.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_kvargs.h>\n \n #include \"rte_pmd_ark.h\"\ndiff --git a/drivers/net/ark/ark_ethdev_rx.h b/drivers/net/ark/ark_ethdev_rx.h\nindex 001fa9bdfa..33c1f2c953 100644\n--- a/drivers/net/ark/ark_ethdev_rx.h\n+++ b/drivers/net/ark/ark_ethdev_rx.h\n@@ -9,7 +9,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_mempool.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n extern uint64_t ark_timestamp_rx_dynflag;\n extern int ark_timestamp_dynfield_offset;\ndiff --git a/drivers/net/ark/ark_ethdev_tx.h b/drivers/net/ark/ark_ethdev_tx.h\nindex e448ce2225..12c71a7158 100644\n--- a/drivers/net/ark/ark_ethdev_tx.h\n+++ b/drivers/net/ark/ark_ethdev_tx.h\n@@ -7,7 +7,7 @@\n \n #include <stdint.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n \n uint16_t eth_ark_xmit_pkts_noop(void *vtxq,\ndiff --git a/drivers/net/ark/ark_ext.h b/drivers/net/ark/ark_ext.h\nindex 5a987e4d67..821fb55bba 100644\n--- a/drivers/net/ark/ark_ext.h\n+++ b/drivers/net/ark/ark_ext.h\n@@ -5,7 +5,7 @@\n #ifndef _ARK_EXT_H_\n #define _ARK_EXT_H_\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n /*\n  * This is the template file for users who which to define a dynamic\ndiff --git a/drivers/net/ark/ark_global.h b/drivers/net/ark/ark_global.h\nindex 403df5900b..91726ecc20 100644\n--- a/drivers/net/ark/ark_global.h\n+++ b/drivers/net/ark/ark_global.h\n@@ -9,7 +9,7 @@\n #include <assert.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/ark/ark_pktchkr.c b/drivers/net/ark/ark_pktchkr.c\nindex b8fb69497d..0f2d31e5be 100644\n--- a/drivers/net/ark/ark_pktchkr.c\n+++ b/drivers/net/ark/ark_pktchkr.c\n@@ -8,7 +8,7 @@\n #include <unistd.h>\n \n #include <rte_string_fns.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"ark_pktchkr.h\"\ndiff --git a/drivers/net/ark/ark_pktgen.c b/drivers/net/ark/ark_pktgen.c\nindex 4a02662a46..ac4322a359 100644\n--- a/drivers/net/ark/ark_pktgen.c\n+++ b/drivers/net/ark/ark_pktgen.c\n@@ -10,7 +10,7 @@\n #include <rte_string_fns.h>\n #include <rte_eal.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"ark_pktgen.h\"\ndiff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c\nindex b0716773ad..473f6209f6 100644\n--- a/drivers/net/atlantic/atl_ethdev.c\n+++ b/drivers/net/atlantic/atl_ethdev.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <rte_string_fns.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_alarm.h>\n \n #include \"atl_ethdev.h\"\ndiff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c\nindex 449ffd454d..7d367c9306 100644\n--- a/drivers/net/atlantic/atl_rxtx.c\n+++ b/drivers/net/atlantic/atl_rxtx.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_net.h>\n \n #include \"atl_ethdev.h\"\ndiff --git a/drivers/net/atlantic/rte_pmd_atlantic.c b/drivers/net/atlantic/rte_pmd_atlantic.c\nindex 2962f5c6cb..00fc2872e5 100644\n--- a/drivers/net/atlantic/rte_pmd_atlantic.c\n+++ b/drivers/net/atlantic/rte_pmd_atlantic.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2018 Aquantia Corporation\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"rte_pmd_atlantic.h\"\n #include \"atl_ethdev.h\"\ndiff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c\nindex f531e03c02..566a3606a2 100644\n--- a/drivers/net/avp/avp_ethdev.c\n+++ b/drivers/net/avp/avp_ethdev.c\n@@ -8,8 +8,8 @@\n #include <errno.h>\n #include <unistd.h>\n \n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h\nindex 91404ca01c..b83fdcca85 100644\n--- a/drivers/net/axgbe/axgbe_common.h\n+++ b/drivers/net/axgbe/axgbe_common.h\n@@ -35,7 +35,7 @@\n #include <rte_ethdev.h>\n #include <rte_dev.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_common.h>\n #include <rte_cycles.h>\n #include <rte_io.h>\ndiff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c\nindex d35c75a2e2..50db70dfcd 100644\n--- a/drivers/net/bnx2x/bnx2x_ethdev.c\n+++ b/drivers/net/bnx2x/bnx2x_ethdev.c\n@@ -10,7 +10,7 @@\n \n #include <rte_string_fns.h>\n #include <rte_dev.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_alarm.h>\n \n /*\ndiff --git a/drivers/net/bnx2x/bnx2x_ethdev.h b/drivers/net/bnx2x/bnx2x_ethdev.h\nindex f712bb3e84..fa1c3ba955 100644\n--- a/drivers/net/bnx2x/bnx2x_ethdev.h\n+++ b/drivers/net/bnx2x/bnx2x_ethdev.h\n@@ -31,7 +31,7 @@\n #include <rte_debug.h>\n #include <rte_pci.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_spinlock.h>\n #include <rte_eal.h>\n #include <rte_mempool.h>\ndiff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex d2d76b623a..0db6e58f3d 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -12,7 +12,7 @@\n \n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_memory.h>\n #include <rte_lcore.h>\n #include <rte_spinlock.h>\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 74b0f3d1dc..e8a7a8ecd4 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -7,8 +7,8 @@\n #include <stdbool.h>\n \n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_cycles.h>\n #include <rte_alarm.h>\ndiff --git a/drivers/net/bnxt/bnxt_stats.h b/drivers/net/bnxt/bnxt_stats.h\nindex 3cf2a1b822..50c3d92b9a 100644\n--- a/drivers/net/bnxt/bnxt_stats.h\n+++ b/drivers/net/bnxt/bnxt_stats.h\n@@ -6,7 +6,7 @@\n #ifndef _BNXT_STATS_H_\n #define _BNXT_STATS_H_\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n void bnxt_free_stats(struct bnxt *bp);\n int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,\ndiff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c\nindex d67db46c65..965381c0c4 100644\n--- a/drivers/net/bnxt/rte_pmd_bnxt.c\n+++ b/drivers/net/bnxt/rte_pmd_bnxt.c\n@@ -8,7 +8,7 @@\n #include <unistd.h>\n \n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_cycles.h>\n #include <rte_byteorder.h>\ndiff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h\nindex 8f198bd50e..75fb8dc02e 100644\n--- a/drivers/net/bonding/eth_bond_private.h\n+++ b/drivers/net/bonding/eth_bond_private.h\n@@ -8,7 +8,7 @@\n #include <stdint.h>\n #include <sys/queue.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_flow.h>\n #include <rte_spinlock.h>\n #include <rte_bitmap.h>\ndiff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c\nindex 55c8e3167c..17e6ff8b90 100644\n--- a/drivers/net/bonding/rte_eth_bond_api.c\n+++ b/drivers/net/bonding/rte_eth_bond_api.c\n@@ -6,7 +6,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_tcp.h>\n #include <rte_bus_vdev.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex 66ab8dd693..5241c60089 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -7,8 +7,8 @@\n \n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_tcp.h>\n #include <rte_udp.h>\n #include <rte_ip.h>\ndiff --git a/drivers/net/cxgbe/base/t4_hw.c b/drivers/net/cxgbe/base/t4_hw.c\nindex ef20dc6675..0e3033b550 100644\n--- a/drivers/net/cxgbe/base/t4_hw.c\n+++ b/drivers/net/cxgbe/base/t4_hw.c\n@@ -16,7 +16,7 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/cxgbe/base/t4vf_hw.c b/drivers/net/cxgbe/base/t4vf_hw.c\nindex cd011bc1b8..561d759dbc 100644\n--- a/drivers/net/cxgbe/base/t4vf_hw.c\n+++ b/drivers/net/cxgbe/base/t4vf_hw.c\n@@ -3,7 +3,7 @@\n  * All rights reserved.\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n \n #include \"common.h\"\ndiff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c\nindex cfa385bab7..bfa57c979d 100644\n--- a/drivers/net/cxgbe/cxgbe_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbe_ethdev.c\n@@ -28,8 +28,8 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c\nindex 3b56eccfbe..83ad758e88 100644\n--- a/drivers/net/cxgbe/cxgbe_main.c\n+++ b/drivers/net/cxgbe/cxgbe_main.c\n@@ -27,8 +27,8 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_random.h>\n #include <rte_dev.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/net/cxgbe/cxgbevf_ethdev.c b/drivers/net/cxgbe/cxgbevf_ethdev.c\nindex c2918f5356..bf1815c25f 100644\n--- a/drivers/net/cxgbe/cxgbevf_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbevf_ethdev.c\n@@ -3,8 +3,8 @@\n  * All rights reserved.\n  */\n \n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n \n #include \"cxgbe.h\"\n #include \"cxgbe_pfvf.h\"\ndiff --git a/drivers/net/cxgbe/cxgbevf_main.c b/drivers/net/cxgbe/cxgbevf_main.c\nindex 9ee060504f..f639612ae4 100644\n--- a/drivers/net/cxgbe/cxgbevf_main.c\n+++ b/drivers/net/cxgbe/cxgbevf_main.c\n@@ -3,8 +3,8 @@\n  * All rights reserved.\n  */\n \n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n \n #include \"base/common.h\"\ndiff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c\nindex 8c7dbe3a1d..56b8ec1f33 100644\n--- a/drivers/net/cxgbe/sge.c\n+++ b/drivers/net/cxgbe/sge.c\n@@ -28,7 +28,7 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c\nindex 0c87c136d7..d643514de6 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.c\n+++ b/drivers/net/dpaa/dpaa_ethdev.c\n@@ -29,7 +29,7 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_ring.h>\n \ndiff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h\nindex a858b1372c..b5728e09c2 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.h\n+++ b/drivers/net/dpaa/dpaa_ethdev.h\n@@ -9,7 +9,7 @@\n \n /* System headers */\n #include <stdbool.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_event_eth_rx_adapter.h>\n \n #include <fsl_usd.h>\ndiff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c\nindex e2459d9b99..e38fba23c0 100644\n--- a/drivers/net/dpaa/dpaa_rxtx.c\n+++ b/drivers/net/dpaa/dpaa_rxtx.c\n@@ -26,7 +26,7 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_ring.h>\n #include <rte_ip.h>\ndiff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c\nindex 25b1d2bb6d..87c893db51 100644\n--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c\n+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c\n@@ -9,7 +9,7 @@\n #include <net/if.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 6f38da3cce..38774e255b 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -9,7 +9,7 @@\n #include <net/if.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c\nindex 9cca6d16c3..003b379fa7 100644\n--- a/drivers/net/dpaa2/dpaa2_rxtx.c\n+++ b/drivers/net/dpaa2/dpaa2_rxtx.c\n@@ -9,7 +9,7 @@\n #include <net/if.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c\nindex 2036c6e917..9b8c4a7de5 100644\n--- a/drivers/net/e1000/em_ethdev.c\n+++ b/drivers/net/e1000/em_ethdev.c\n@@ -15,8 +15,8 @@\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex 19e3bffd46..db5d1222ce 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -32,7 +32,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_prefetch.h>\n #include <rte_ip.h>\n #include <rte_udp.h>\ndiff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c\nindex dfe87508c2..ec355cbf35 100644\n--- a/drivers/net/e1000/igb_ethdev.c\n+++ b/drivers/net/e1000/igb_ethdev.c\n@@ -17,8 +17,8 @@\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c\nindex ccb184df95..33f6b1d6b3 100644\n--- a/drivers/net/e1000/igb_flow.c\n+++ b/drivers/net/e1000/igb_flow.c\n@@ -15,8 +15,8 @@\n #include <rte_debug.h>\n #include <rte_pci.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_memory.h>\n #include <rte_eal.h>\n #include <rte_atomic.h>\ndiff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c\nindex 9d74c08abe..2ce74dd5a9 100644\n--- a/drivers/net/e1000/igb_pf.c\n+++ b/drivers/net/e1000/igb_pf.c\n@@ -16,7 +16,7 @@\n #include <rte_debug.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_memcpy.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex dd520cd82c..1500d2ffff 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -31,7 +31,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_prefetch.h>\n #include <rte_udp.h>\n #include <rte_tcp.h>\ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 20ff3653c6..c796af4aa7 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -5,8 +5,8 @@\n \n #include <rte_string_fns.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_tcp.h>\n #include <rte_atomic.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c\nindex 4d2c9c0474..0b45168c60 100644\n--- a/drivers/net/enetc/enetc_ethdev.c\n+++ b/drivers/net/enetc/enetc_ethdev.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <stdbool.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_random.h>\n #include <dpaax_iova_table.h>\n \ndiff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c\nindex 1c8d60e264..b3f441c8f7 100644\n--- a/drivers/net/enic/enic_ethdev.c\n+++ b/drivers/net/enic/enic_ethdev.c\n@@ -9,8 +9,8 @@\n #include <rte_dev.h>\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_kvargs.h>\n #include <rte_string_fns.h>\n \ndiff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c\nindex 1eec96abca..97ee7509ce 100644\n--- a/drivers/net/enic/enic_flow.c\n+++ b/drivers/net/enic/enic_flow.c\n@@ -5,7 +5,7 @@\n #include <errno.h>\n #include <stdint.h>\n #include <rte_log.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_flow_driver.h>\n #include <rte_ether.h>\n #include <rte_ip.h>\ndiff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c\nindex ad1e89a581..21d9b1cef7 100644\n--- a/drivers/net/enic/enic_fm_flow.c\n+++ b/drivers/net/enic/enic_fm_flow.c\n@@ -5,7 +5,7 @@\n #include <errno.h>\n #include <stdint.h>\n #include <rte_log.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_flow_driver.h>\n #include <rte_ether.h>\n #include <rte_hash.h>\ndiff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c\nindex 805eb5e46a..2a06d46872 100644\n--- a/drivers/net/enic/enic_main.c\n+++ b/drivers/net/enic/enic_main.c\n@@ -15,7 +15,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_string_fns.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"enic_compat.h\"\n #include \"enic.h\"\ndiff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c\nindex 1405db15ab..689bf748ae 100644\n--- a/drivers/net/enic/enic_res.c\n+++ b/drivers/net/enic/enic_res.c\n@@ -4,7 +4,7 @@\n  */\n \n #include \"enic_compat.h\"\n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"wq_enet_desc.h\"\n #include \"rq_enet_desc.h\"\n #include \"cq_enet_desc.h\"\ndiff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c\nindex 4b6b97eb10..a2a02227e3 100644\n--- a/drivers/net/enic/enic_rxtx.c\n+++ b/drivers/net/enic/enic_rxtx.c\n@@ -4,7 +4,7 @@\n  */\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_net.h>\n #include <rte_prefetch.h>\n \ndiff --git a/drivers/net/enic/enic_rxtx_vec_avx2.c b/drivers/net/enic/enic_rxtx_vec_avx2.c\nindex f0bea33423..1848f52717 100644\n--- a/drivers/net/enic/enic_rxtx_vec_avx2.c\n+++ b/drivers/net/enic/enic_rxtx_vec_avx2.c\n@@ -4,7 +4,7 @@\n  */\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_vect.h>\n \n #include \"enic_compat.h\"\ndiff --git a/drivers/net/enic/enic_vf_representor.c b/drivers/net/enic/enic_vf_representor.c\nindex c2c03c0281..f7b79c1c4e 100644\n--- a/drivers/net/enic/enic_vf_representor.c\n+++ b/drivers/net/enic/enic_vf_representor.c\n@@ -8,8 +8,8 @@\n #include <rte_bus_pci.h>\n #include <rte_common.h>\n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_flow_driver.h>\n #include <rte_kvargs.h>\n #include <rte_pci.h>\ndiff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c\nindex ba81c82174..e3bda0df2b 100644\n--- a/drivers/net/failsafe/failsafe.c\n+++ b/drivers/net/failsafe/failsafe.c\n@@ -7,8 +7,8 @@\n \n #include <rte_alarm.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_devargs.h>\n #include <rte_kvargs.h>\n #include <rte_bus_vdev.h>\ndiff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c\nindex 492047f587..2b6ca9080d 100644\n--- a/drivers/net/failsafe/failsafe_ops.c\n+++ b/drivers/net/failsafe/failsafe_ops.c\n@@ -9,7 +9,7 @@\n \n #include <rte_debug.h>\n #include <rte_atomic.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_flow.h>\n #include <rte_cycles.h>\ndiff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h\nindex 0f9a572af8..cd39d103c6 100644\n--- a/drivers/net/failsafe/failsafe_private.h\n+++ b/drivers/net/failsafe/failsafe_private.h\n@@ -12,7 +12,7 @@\n \n #include <rte_atomic.h>\n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_devargs.h>\n #include <rte_flow.h>\n #include <rte_interrupts.h>\ndiff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_rxtx.c\nindex fee08fa23c..fe67293299 100644\n--- a/drivers/net/failsafe/failsafe_rxtx.c\n+++ b/drivers/net/failsafe/failsafe_rxtx.c\n@@ -6,7 +6,7 @@\n #include <rte_atomic.h>\n #include <rte_debug.h>\n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"failsafe_private.h\"\n \ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex c187088a33..fd471c415e 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -2,8 +2,8 @@\n  * Copyright(c) 2013-2016 Intel Corporation\n  */\n \n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c\nindex 4accaa2cd6..8585c5b9e4 100644\n--- a/drivers/net/fm10k/fm10k_rxtx.c\n+++ b/drivers/net/fm10k/fm10k_rxtx.c\n@@ -4,7 +4,7 @@\n \n #include <inttypes.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n #include <rte_net.h>\n #include \"fm10k.h\"\ndiff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c\nindex 6fcc939ad9..39e3cdac1f 100644\n--- a/drivers/net/fm10k/fm10k_rxtx_vec.c\n+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c\n@@ -4,7 +4,7 @@\n \n #include <inttypes.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n #include \"fm10k.h\"\n #include \"base/fm10k_type.h\"\ndiff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c\nindex 41c99bdbf8..cb9cf6efa2 100644\n--- a/drivers/net/hinic/base/hinic_pmd_hwdev.c\n+++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2017 Huawei Technologies Co., Ltd\n  */\n \n-#include<rte_ethdev_driver.h>\n+#include<ethdev_driver.h>\n #include <rte_bus_pci.h>\n #include <rte_hash.h>\n #include <rte_jhash.h>\ndiff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c\nindex 5a2c171099..1d6b710c9f 100644\n--- a/drivers/net/hinic/hinic_pmd_ethdev.c\n+++ b/drivers/net/hinic/hinic_pmd_ethdev.c\n@@ -4,7 +4,7 @@\n \n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\ndiff --git a/drivers/net/hinic/hinic_pmd_ethdev.h b/drivers/net/hinic/hinic_pmd_ethdev.h\nindex c7338d83be..70b4d32ff2 100644\n--- a/drivers/net/hinic/hinic_pmd_ethdev.h\n+++ b/drivers/net/hinic/hinic_pmd_ethdev.h\n@@ -7,7 +7,7 @@\n \n #include <rte_ethdev.h>\n #include <rte_ethdev_core.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"base/hinic_compat.h\"\n #include \"base/hinic_pmd_cfg.h\"\ndiff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c\nindex f58f4f7adc..45dbead512 100644\n--- a/drivers/net/hns3/hns3_cmd.c\n+++ b/drivers/net/hns3/hns3_cmd.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2018-2019 Hisilicon Limited.\n  */\n \n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_io.h>\n \n #include \"hns3_ethdev.h\"\ndiff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex 449d967784..a796469435 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -4,7 +4,7 @@\n \n #include <rte_alarm.h>\n #include <rte_bus_pci.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_pci.h>\n \n #include \"hns3_ethdev.h\"\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex 0d17170fa7..6374a76794 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -6,7 +6,7 @@\n #define _HNS3_ETHDEV_H_\n \n #include <sys/time.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_byteorder.h>\n #include <rte_io.h>\n #include <rte_spinlock.h>\ndiff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c\nindex bb4ec6bb39..394ffe38cd 100644\n--- a/drivers/net/hns3/hns3_ethdev_vf.c\n+++ b/drivers/net/hns3/hns3_ethdev_vf.c\n@@ -4,7 +4,7 @@\n \n #include <linux/pci_regs.h>\n #include <rte_alarm.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_io.h>\n #include <rte_pci.h>\n #include <rte_vfio.h>\ndiff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c\nindex 857cc94c98..896540df78 100644\n--- a/drivers/net/hns3/hns3_fdir.c\n+++ b/drivers/net/hns3/hns3_fdir.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2018-2019 Hisilicon Limited.\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_hash.h>\n #include <rte_hash_crc.h>\n #include <rte_io.h>\ndiff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c\nindex d2a5db8aab..1d500b984c 100644\n--- a/drivers/net/hns3/hns3_mbx.c\n+++ b/drivers/net/hns3/hns3_mbx.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2018-2019 Hisilicon Limited.\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_io.h>\n \n #include \"hns3_ethdev.h\"\ndiff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c\nindex ed2567a8ff..3342a781ad 100644\n--- a/drivers/net/hns3/hns3_mp.c\n+++ b/drivers/net/hns3/hns3_mp.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <rte_eal.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_string_fns.h>\n #include <rte_io.h>\n \ndiff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c\nindex f2cb465eed..01550458b7 100644\n--- a/drivers/net/hns3/hns3_regs.c\n+++ b/drivers/net/hns3/hns3_regs.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2018-2019 Hisilicon Limited.\n  */\n \n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_io.h>\n \n #include \"hns3_ethdev.h\"\ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 0badfc9260..676962553f 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -6,7 +6,7 @@\n #include <rte_common.h>\n #include <rte_cycles.h>\n #include <rte_vxlan.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_io.h>\n #include <rte_net.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c\nindex a26c83d146..2bc4372449 100644\n--- a/drivers/net/hns3/hns3_rxtx_vec.c\n+++ b/drivers/net/hns3/hns3_rxtx_vec.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <rte_io.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"hns3_ethdev.h\"\n #include \"hns3_rxtx.h\"\ndiff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c\nindex 8c2c8f6108..b02bae7a0d 100644\n--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c\n+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c\n@@ -4,7 +4,7 @@\n \n #include <arm_sve.h>\n #include <rte_io.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"hns3_ethdev.h\"\n #include \"hns3_rxtx.h\"\ndiff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 946994b80a..d7cd049891 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -17,8 +17,8 @@\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_memzone.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\ndiff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c\nindex 5d7db7fe13..2909b4d894 100644\n--- a/drivers/net/i40e/i40e_ethdev_vf.c\n+++ b/drivers/net/i40e/i40e_ethdev_vf.c\n@@ -25,8 +25,8 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_dev.h>\n \ndiff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c\nindex f5defcf585..c572d003cb 100644\n--- a/drivers/net/i40e/i40e_fdir.c\n+++ b/drivers/net/i40e/i40e_fdir.c\n@@ -11,7 +11,7 @@\n #include <stdarg.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_memzone.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c\nindex 7fe760dba2..4d44282312 100644\n--- a/drivers/net/i40e/i40e_flow.c\n+++ b/drivers/net/i40e/i40e_flow.c\n@@ -12,7 +12,7 @@\n \n #include <rte_debug.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_tailq.h>\ndiff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c\nindex 65d649b627..f3d6d899f6 100644\n--- a/drivers/net/i40e/i40e_pf.c\n+++ b/drivers/net/i40e/i40e_pf.c\n@@ -14,7 +14,7 @@\n #include <rte_string_fns.h>\n #include <rte_pci.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n \ndiff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c\nindex 89560d4ee5..00db6c88a3 100644\n--- a/drivers/net/i40e/i40e_rxtx.c\n+++ b/drivers/net/i40e/i40e_rxtx.c\n@@ -17,7 +17,7 @@\n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_tcp.h>\n #include <rte_sctp.h>\n #include <rte_udp.h>\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/i40e/i40e_rxtx_vec_altivec.c\nindex d3238bfb6a..e6e468752c 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c\n@@ -4,7 +4,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"base/i40e_prototype.h\"\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c\nindex e5a1deaeb2..ea554b4fda 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"base/i40e_prototype.h\"\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c\nindex e92f97b7ed..80b153e8f6 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"base/i40e_prototype.h\"\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h\nindex 31f73f6054..33cebbe88b 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_common.h\n+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h\n@@ -5,7 +5,7 @@\n #ifndef _I40E_RXTX_VEC_COMMON_H_\n #define _I40E_RXTX_VEC_COMMON_H_\n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"i40e_ethdev.h\"\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c\nindex f094de69ae..d81269624e 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c\n@@ -4,7 +4,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_vect.h>\n \ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c\nindex 0bcb48e24e..45fce0a022 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"base/i40e_prototype.h\"\ndiff --git a/drivers/net/i40e/i40e_vf_representor.c b/drivers/net/i40e/i40e_vf_representor.c\nindex 9e40406a3d..7ed47c1a2c 100644\n--- a/drivers/net/i40e/i40e_vf_representor.c\n+++ b/drivers/net/i40e/i40e_vf_representor.c\n@@ -7,7 +7,7 @@\n #include <rte_pci.h>\n #include <rte_malloc.h>\n \n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"base/i40e_type.h\"\n #include \"base/virtchnl.h\"\n #include \"i40e_ethdev.h\"\ndiff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c\nindex cf6ea0b15c..e9c8c1157a 100644\n--- a/drivers/net/iavf/iavf_ethdev.c\n+++ b/drivers/net/iavf/iavf_ethdev.c\n@@ -19,8 +19,8 @@\n #include <rte_atomic.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c\nindex f48f574a5d..4e864b4b9c 100644\n--- a/drivers/net/iavf/iavf_fdir.c\n+++ b/drivers/net/iavf/iavf_fdir.c\n@@ -11,7 +11,7 @@\n #include <stdarg.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_tailq.h>\n \ndiff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c\nindex aabbcf34c2..8635ff83ca 100644\n--- a/drivers/net/iavf/iavf_generic_flow.c\n+++ b/drivers/net/iavf/iavf_generic_flow.c\n@@ -11,7 +11,7 @@\n #include <stdarg.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_tailq.h>\n \ndiff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c\nindex 958c73c4fb..f437fc3170 100644\n--- a/drivers/net/iavf/iavf_hash.c\n+++ b/drivers/net/iavf/iavf_hash.c\n@@ -12,7 +12,7 @@\n \n #include <rte_debug.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_eth_ctrl.h>\ndiff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c\nindex 1ddbad0f1f..3d471d9acc 100644\n--- a/drivers/net/iavf/iavf_rxtx.c\n+++ b/drivers/net/iavf/iavf_rxtx.c\n@@ -17,7 +17,7 @@\n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_tcp.h>\n #include <rte_sctp.h>\n #include <rte_udp.h>\ndiff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h\nindex 7ad1e0f68a..46a18732d3 100644\n--- a/drivers/net/iavf/iavf_rxtx_vec_common.h\n+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h\n@@ -5,7 +5,7 @@\n #ifndef _IAVF_RXTX_VEC_COMMON_H_\n #define _IAVF_RXTX_VEC_COMMON_H_\n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"iavf.h\"\ndiff --git a/drivers/net/iavf/iavf_rxtx_vec_sse.c b/drivers/net/iavf/iavf_rxtx_vec_sse.c\nindex 75c77f9d32..8574d0830f 100644\n--- a/drivers/net/iavf/iavf_rxtx_vec_sse.c\n+++ b/drivers/net/iavf/iavf_rxtx_vec_sse.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"iavf.h\"\ndiff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c\nindex 3ef29d509d..8add888987 100644\n--- a/drivers/net/iavf/iavf_vchnl.c\n+++ b/drivers/net/iavf/iavf_vchnl.c\n@@ -16,8 +16,8 @@\n #include <rte_atomic.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_dev.h>\n \n #include \"iavf.h\"\ndiff --git a/drivers/net/ice/ice_acl_filter.c b/drivers/net/ice/ice_acl_filter.c\nindex 363ce68318..113cb68765 100644\n--- a/drivers/net/ice/ice_acl_filter.c\n+++ b/drivers/net/ice/ice_acl_filter.c\n@@ -11,7 +11,7 @@\n #include <stdarg.h>\n #include <rte_debug.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_eth_ctrl.h>\ndiff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c\nindex 4a9af3292c..dbe42fa3df 100644\n--- a/drivers/net/ice/ice_dcf.c\n+++ b/drivers/net/ice/ice_dcf.c\n@@ -17,8 +17,8 @@\n #include <rte_atomic.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/ice/ice_dcf.h b/drivers/net/ice/ice_dcf.h\nindex ff029963bf..0cb90b5e9f 100644\n--- a/drivers/net/ice/ice_dcf.h\n+++ b/drivers/net/ice/ice_dcf.h\n@@ -5,7 +5,7 @@\n #ifndef _ICE_DCF_H_\n #define _ICE_DCF_H_\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include <iavf_prototype.h>\n #include <iavf_adminq_cmd.h>\ndiff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c\nindex ea1f2951ba..86f70cf7ff 100644\n--- a/drivers/net/ice/ice_dcf_ethdev.c\n+++ b/drivers/net/ice/ice_dcf_ethdev.c\n@@ -14,7 +14,7 @@\n #include <rte_atomic.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_kvargs.h>\n #include <rte_malloc.h>\n #include <rte_memzone.h>\ndiff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c\nindex ec29f0fe40..c021d7ab6c 100644\n--- a/drivers/net/ice/ice_ethdev.c\n+++ b/drivers/net/ice/ice_ethdev.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <rte_string_fns.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n \n #include <stdio.h>\n #include <sys/types.h>\ndiff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h\nindex 2b03c59671..7e9cbd2e9a 100644\n--- a/drivers/net/ice/ice_ethdev.h\n+++ b/drivers/net/ice/ice_ethdev.h\n@@ -7,7 +7,7 @@\n \n #include <rte_kvargs.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"base/ice_common.h\"\n #include \"base/ice_adminq_cmd.h\"\ndiff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c\nindex c4496dbbe1..25d15a8adb 100644\n--- a/drivers/net/ice/ice_generic_flow.c\n+++ b/drivers/net/ice/ice_generic_flow.c\n@@ -11,7 +11,7 @@\n #include <stdarg.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_tailq.h>\n \ndiff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c\nindex 2d23c8dd50..322df649b1 100644\n--- a/drivers/net/ice/ice_hash.c\n+++ b/drivers/net/ice/ice_hash.c\n@@ -12,7 +12,7 @@\n \n #include <rte_debug.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_eth_ctrl.h>\ndiff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c\nindex 7286e3a445..6727d94c04 100644\n--- a/drivers/net/ice/ice_rxtx.c\n+++ b/drivers/net/ice/ice_rxtx.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2018 Intel Corporation\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_net.h>\n #include <rte_vect.h>\n \ndiff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c\nindex 7bac77ecd1..5ca0985e21 100644\n--- a/drivers/net/ice/ice_switch_filter.c\n+++ b/drivers/net/ice/ice_switch_filter.c\n@@ -11,7 +11,7 @@\n #include <stdarg.h>\n #include <rte_debug.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_eth_ctrl.h>\ndiff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c\nindex 802212fc57..dbaa7a83e5 100644\n--- a/drivers/net/igc/igc_ethdev.c\n+++ b/drivers/net/igc/igc_ethdev.c\n@@ -8,8 +8,8 @@\n #include <rte_string_fns.h>\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_alarm.h>\n \ndiff --git a/drivers/net/igc/igc_filter.h b/drivers/net/igc/igc_filter.h\nindex 877f51c88b..df8516bc40 100644\n--- a/drivers/net/igc/igc_filter.h\n+++ b/drivers/net/igc/igc_filter.h\n@@ -8,7 +8,7 @@\n \n #include <rte_ethdev.h>\n #include <rte_ethdev_core.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_eth_ctrl.h>\n \n #include \"igc_ethdev.h\"\ndiff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c\nindex 4654ec41f0..c0a5d5e84f 100644\n--- a/drivers/net/igc/igc_txrx.c\n+++ b/drivers/net/igc/igc_txrx.c\n@@ -4,7 +4,7 @@\n \n #include <rte_config.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_net.h>\n \n #include \"igc_logs.h\"\ndiff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c\nindex 2face7c635..ded3ffe48d 100644\n--- a/drivers/net/ionic/ionic_ethdev.c\n+++ b/drivers/net/ionic/ionic_ethdev.c\n@@ -5,9 +5,9 @@\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_ethdev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n \n #include \"ionic_logs.h\"\n #include \"ionic.h\"\ndiff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c\nindex f39b54e8ef..f3d55c0fa6 100644\n--- a/drivers/net/ionic/ionic_lif.c\n+++ b/drivers/net/ionic/ionic_lif.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"ionic.h\"\n #include \"ionic_logs.h\"\ndiff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c\nindex 5d0e9d5d5a..61ad396469 100644\n--- a/drivers/net/ionic/ionic_rxtx.c\n+++ b/drivers/net/ionic/ionic_rxtx.c\n@@ -31,7 +31,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_prefetch.h>\n #include <rte_udp.h>\n #include <rte_tcp.h>\ndiff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c b/drivers/net/ipn3ke/ipn3ke_ethdev.c\nindex 4446d2af9e..f8e751cb09 100644\n--- a/drivers/net/ipn3ke/ipn3ke_ethdev.c\n+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.c\n@@ -11,7 +11,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_sched.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include <rte_io.h>\n #include <rte_rawdev.h>\ndiff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.h b/drivers/net/ipn3ke/ipn3ke_ethdev.h\nindex a6815a9cca..ba3f8821e2 100644\n--- a/drivers/net/ipn3ke/ipn3ke_ethdev.h\n+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.h\n@@ -15,8 +15,8 @@\n \n #include <rte_mbuf.h>\n #include <rte_flow_driver.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_bus_vdev.h>\ndiff --git a/drivers/net/ipn3ke/ipn3ke_flow.c b/drivers/net/ipn3ke/ipn3ke_flow.c\nindex f857e64afb..c702e19ea5 100644\n--- a/drivers/net/ipn3ke/ipn3ke_flow.c\n+++ b/drivers/net/ipn3ke/ipn3ke_flow.c\n@@ -13,7 +13,7 @@\n #include <rte_io.h>\n #include <rte_debug.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_eth_ctrl.h>\ndiff --git a/drivers/net/ipn3ke/ipn3ke_representor.c b/drivers/net/ipn3ke/ipn3ke_representor.c\nindex 9e15cce34f..856d21ef9b 100644\n--- a/drivers/net/ipn3ke/ipn3ke_representor.c\n+++ b/drivers/net/ipn3ke/ipn3ke_representor.c\n@@ -12,7 +12,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_sched.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_spinlock.h>\n \n #include <rte_io.h>\ndiff --git a/drivers/net/ipn3ke/ipn3ke_tm.c b/drivers/net/ipn3ke/ipn3ke_tm.c\nindex 17ac026d38..6a9b98fd7f 100644\n--- a/drivers/net/ipn3ke/ipn3ke_tm.c\n+++ b/drivers/net/ipn3ke/ipn3ke_tm.c\n@@ -14,7 +14,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_sched.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include <rte_io.h>\n #include <rte_rawdev.h>\ndiff --git a/drivers/net/ixgbe/ixgbe_bypass.c b/drivers/net/ixgbe/ixgbe_bypass.c\nindex ae38ce3559..67ced6c723 100644\n--- a/drivers/net/ixgbe/ixgbe_bypass.c\n+++ b/drivers/net/ixgbe/ixgbe_bypass.c\n@@ -4,7 +4,7 @@\n \n #include <time.h>\n #include <rte_atomic.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include \"ixgbe_ethdev.h\"\n #include \"ixgbe_bypass_api.h\"\n #include \"rte_pmd_ixgbe.h\"\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex c8b9ec8c11..761a0f26bb 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -27,8 +27,8 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/ixgbe/ixgbe_fdir.c b/drivers/net/ixgbe/ixgbe_fdir.c\nindex 11b9effeba..27a49bbce5 100644\n--- a/drivers/net/ixgbe/ixgbe_fdir.c\n+++ b/drivers/net/ixgbe/ixgbe_fdir.c\n@@ -13,7 +13,7 @@\n #include <rte_debug.h>\n #include <rte_pci.h>\n #include <rte_vxlan.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"ixgbe_logs.h\"\ndiff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c\nindex 9aeb2e4a49..0b10e91a9b 100644\n--- a/drivers/net/ixgbe/ixgbe_flow.c\n+++ b/drivers/net/ixgbe/ixgbe_flow.c\n@@ -25,7 +25,7 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/ixgbe/ixgbe_ipsec.c\nindex 62f2a5f764..e45c5501e6 100644\n--- a/drivers/net/ixgbe/ixgbe_ipsec.c\n+++ b/drivers/net/ixgbe/ixgbe_ipsec.c\n@@ -2,8 +2,8 @@\n  * Copyright(c) 2010-2017 Intel Corporation\n  */\n \n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_ip.h>\n #include <rte_jhash.h>\n #include <rte_security_driver.h>\ndiff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c\nindex 15982af8da..fbf2b17d16 100644\n--- a/drivers/net/ixgbe/ixgbe_pf.c\n+++ b/drivers/net/ixgbe/ixgbe_pf.c\n@@ -15,7 +15,7 @@\n #include <rte_debug.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_memcpy.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex cc8f70e6dd..470cf12dec 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -33,7 +33,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_security_driver.h>\n #include <rte_prefetch.h>\n #include <rte_udp.h>\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\nindex a97c27189b..adba855ca3 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n@@ -5,7 +5,7 @@\n #ifndef _IXGBE_RXTX_VEC_COMMON_H_\n #define _IXGBE_RXTX_VEC_COMMON_H_\n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"ixgbe_ethdev.h\"\n #include \"ixgbe_rxtx.h\"\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c\nindex a5a5b2167f..f83b800ad9 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_vect.h>\n \ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\nindex 90c076825a..9bbffe6119 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <stdint.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n \n #include \"ixgbe_ethdev.h\"\ndiff --git a/drivers/net/ixgbe/ixgbe_vf_representor.c b/drivers/net/ixgbe/ixgbe_vf_representor.c\nindex 8185f0d3bb..d5b636a194 100644\n--- a/drivers/net/ixgbe/ixgbe_vf_representor.c\n+++ b/drivers/net/ixgbe/ixgbe_vf_representor.c\n@@ -6,7 +6,7 @@\n #include <rte_pci.h>\n #include <rte_malloc.h>\n \n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"base/ixgbe_type.h\"\n #include \"base/ixgbe_vf.h\"\n #include \"ixgbe_ethdev.h\"\ndiff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/ixgbe/rte_pmd_ixgbe.c\nindex d2f708242c..cf089cd9ae 100644\n--- a/drivers/net/ixgbe/rte_pmd_ixgbe.c\n+++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2010-2017 Intel Corporation\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"base/ixgbe_api.h\"\n #include \"base/ixgbe_x550.h\"\ndiff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c\nindex 1696787a9b..9ce74e549b 100644\n--- a/drivers/net/kni/rte_eth_kni.c\n+++ b/drivers/net/kni/rte_eth_kni.c\n@@ -7,8 +7,8 @@\n #include <unistd.h>\n \n #include <rte_string_fns.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_kni.h>\n #include <rte_kvargs.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/liquidio/base/lio_23xx_vf.c b/drivers/net/liquidio/base/lio_23xx_vf.c\nindex ddbc8c0e0c..c6b8310b71 100644\n--- a/drivers/net/liquidio/base/lio_23xx_vf.c\n+++ b/drivers/net/liquidio/base/lio_23xx_vf.c\n@@ -4,7 +4,7 @@\n \n #include <string.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_cycles.h>\n #include <rte_malloc.h>\n \ndiff --git a/drivers/net/liquidio/base/lio_mbox.c b/drivers/net/liquidio/base/lio_mbox.c\nindex 1129001515..2ac2b1b334 100644\n--- a/drivers/net/liquidio/base/lio_mbox.c\n+++ b/drivers/net/liquidio/base/lio_mbox.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2017 Cavium, Inc\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_cycles.h>\n \n #include \"lio_logs.h\"\ndiff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c\nindex eb0fdab45a..0b189d5d15 100644\n--- a/drivers/net/liquidio/lio_ethdev.c\n+++ b/drivers/net/liquidio/lio_ethdev.c\n@@ -3,8 +3,8 @@\n  */\n \n #include <rte_string_fns.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_cycles.h>\n #include <rte_malloc.h>\n #include <rte_alarm.h>\ndiff --git a/drivers/net/liquidio/lio_rxtx.c b/drivers/net/liquidio/lio_rxtx.c\nindex 8d705bfe7f..a067b60e47 100644\n--- a/drivers/net/liquidio/lio_rxtx.c\n+++ b/drivers/net/liquidio/lio_rxtx.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2017 Cavium, Inc\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_cycles.h>\n #include <rte_malloc.h>\n \ndiff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c\nindex c526f90778..5b373738e6 100644\n--- a/drivers/net/memif/memif_socket.c\n+++ b/drivers/net/memif/memif_socket.c\n@@ -13,8 +13,8 @@\n #include <rte_version.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_kvargs.h>\n #include <rte_bus_vdev.h>\ndiff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c\nindex 8ed9aebab7..77c95bcb7a 100644\n--- a/drivers/net/memif/rte_eth_memif.c\n+++ b/drivers/net/memif/rte_eth_memif.c\n@@ -17,8 +17,8 @@\n #include <rte_version.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_kvargs.h>\n #include <rte_bus_vdev.h>\ndiff --git a/drivers/net/memif/rte_eth_memif.h b/drivers/net/memif/rte_eth_memif.h\nindex 765a7e5998..24321d3a39 100644\n--- a/drivers/net/memif/rte_eth_memif.h\n+++ b/drivers/net/memif/rte_eth_memif.h\n@@ -11,7 +11,7 @@\n \n #include <sys/queue.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_interrupts.h>\n \ndiff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c\nindex d5d8c96351..27af426363 100644\n--- a/drivers/net/mlx4/mlx4.c\n+++ b/drivers/net/mlx4/mlx4.c\n@@ -33,8 +33,8 @@\n #include <rte_common.h>\n #include <rte_dev.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_ether.h>\n #include <rte_flow.h>\n #include <rte_interrupts.h>\ndiff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h\nindex c6cb29493e..63df8fcf2b 100644\n--- a/drivers/net/mlx4/mlx4.h\n+++ b/drivers/net/mlx4/mlx4.h\n@@ -19,7 +19,7 @@\n #pragma GCC diagnostic error \"-Wpedantic\"\n #endif\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_interrupts.h>\n #include <rte_mempool.h>\ndiff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c\nindex 9ff05c6738..783ff94dce 100644\n--- a/drivers/net/mlx4/mlx4_ethdev.c\n+++ b/drivers/net/mlx4/mlx4_ethdev.c\n@@ -34,7 +34,7 @@\n \n #include <rte_bus_pci.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_flow.h>\n #include <rte_pci.h>\ndiff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c\nindex 2a86382db7..b8ecfa829b 100644\n--- a/drivers/net/mlx4/mlx4_flow.c\n+++ b/drivers/net/mlx4/mlx4_flow.c\n@@ -27,7 +27,7 @@\n \n #include <rte_byteorder.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\ndiff --git a/drivers/net/mlx4/mlx4_flow.h b/drivers/net/mlx4/mlx4_flow.h\nindex 26465c66a4..e4366f28bb 100644\n--- a/drivers/net/mlx4/mlx4_flow.h\n+++ b/drivers/net/mlx4/mlx4_flow.h\n@@ -18,7 +18,7 @@\n #pragma GCC diagnostic error \"-Wpedantic\"\n #endif\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\n #include <rte_byteorder.h>\ndiff --git a/drivers/net/mlx4/mlx4_intr.c b/drivers/net/mlx4/mlx4_intr.c\nindex 6786b12ab5..d56009c418 100644\n--- a/drivers/net/mlx4/mlx4_intr.c\n+++ b/drivers/net/mlx4/mlx4_intr.c\n@@ -23,7 +23,7 @@\n \n #include <rte_alarm.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_io.h>\n #include <rte_interrupts.h>\n \ndiff --git a/drivers/net/mlx4/mlx4_mp.c b/drivers/net/mlx4/mlx4_mp.c\nindex eca0c20a8a..e05da89c0e 100644\n--- a/drivers/net/mlx4/mlx4_mp.c\n+++ b/drivers/net/mlx4/mlx4_mp.c\n@@ -7,7 +7,7 @@\n #include <time.h>\n \n #include <rte_eal.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_string_fns.h>\n \n #include \"mlx4.h\"\ndiff --git a/drivers/net/mlx4/mlx4_rxq.c b/drivers/net/mlx4/mlx4_rxq.c\nindex 0699bdd5f2..978cbb8201 100644\n--- a/drivers/net/mlx4/mlx4_rxq.c\n+++ b/drivers/net/mlx4/mlx4_rxq.c\n@@ -26,7 +26,7 @@\n #include <rte_byteorder.h>\n #include <rte_common.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_flow.h>\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\ndiff --git a/drivers/net/mlx4/mlx4_rxtx.h b/drivers/net/mlx4/mlx4_rxtx.h\nindex 9de6c59411..7c72ce6d17 100644\n--- a/drivers/net/mlx4/mlx4_rxtx.h\n+++ b/drivers/net/mlx4/mlx4_rxtx.h\n@@ -19,7 +19,7 @@\n #pragma GCC diagnostic error \"-Wpedantic\"\n #endif\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_mbuf.h>\n #include <rte_mempool.h>\n \ndiff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c\nindex 37b84413fb..8262071505 100644\n--- a/drivers/net/mlx4/mlx4_txq.c\n+++ b/drivers/net/mlx4/mlx4_txq.c\n@@ -27,7 +27,7 @@\n \n #include <rte_common.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_mempool.h>\ndiff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\nindex e36a78091c..0e8de9439e 100644\n--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n@@ -24,7 +24,7 @@\n #include <sys/un.h>\n #include <time.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_bus_pci.h>\n #include <rte_mbuf.h>\n #include <rte_common.h>\ndiff --git a/drivers/net/mlx5/linux/mlx5_mp_os.c b/drivers/net/mlx5/linux/mlx5_mp_os.c\nindex 08ade75799..60fdee22a1 100644\n--- a/drivers/net/mlx5/linux/mlx5_mp_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_mp_os.c\n@@ -7,7 +7,7 @@\n #include <time.h>\n \n #include <rte_eal.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_string_fns.h>\n \n #include <mlx5_common_mp.h>\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 9ac1d46b1b..7efa7c6cd2 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -16,8 +16,8 @@\n #include <fcntl.h>\n \n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_common.h>\ndiff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c\nindex 318e39b1df..43ff85f9c4 100644\n--- a/drivers/net/mlx5/linux/mlx5_verbs.c\n+++ b/drivers/net/mlx5/linux/mlx5_verbs.c\n@@ -14,7 +14,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n \n #include <mlx5_glue.h>\ndiff --git a/drivers/net/mlx5/linux/mlx5_vlan_os.c b/drivers/net/mlx5/linux/mlx5_vlan_os.c\nindex 40e895e080..005904bdfe 100644\n--- a/drivers/net/mlx5/linux/mlx5_vlan_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_vlan_os.c\n@@ -14,7 +14,7 @@\n  */\n #include <sys/types.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n #include <rte_malloc.h>\n #include <rte_hypervisor.h>\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 3730f32295..50a6d2b19f 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -11,8 +11,8 @@\n #include <errno.h>\n \n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_common.h>\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 101e9c20d0..4bbf628885 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -15,7 +15,7 @@\n \n #include <rte_pci.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_rwlock.h>\n #include <rte_interrupts.h>\n #include <rte_errno.h>\ndiff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h\nindex 85a0979653..af29d93901 100644\n--- a/drivers/net/mlx5/mlx5_defs.h\n+++ b/drivers/net/mlx5/mlx5_defs.h\n@@ -6,7 +6,7 @@\n #ifndef RTE_PMD_MLX5_DEFS_H_\n #define RTE_PMD_MLX5_DEFS_H_\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_vxlan.h>\n \n #include \"mlx5_autoconf.h\"\ndiff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c\nindex 45ee7e4488..51b39ddde5 100644\n--- a/drivers/net/mlx5/mlx5_ethdev.c\n+++ b/drivers/net/mlx5/mlx5_ethdev.c\n@@ -10,7 +10,7 @@\n #include <stdlib.h>\n #include <errno.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_bus_pci.h>\n #include <rte_mbuf.h>\n #include <rte_common.h>\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 2ca6148c1d..6716a20141 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -12,7 +12,7 @@\n \n #include <rte_common.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_eal_paging.h>\n #include <rte_flow.h>\n #include <rte_cycles.h>\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex c1ddff7364..707d6749e2 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -10,7 +10,7 @@\n \n #include <rte_common.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c\nindex 2d4381946d..9347490967 100644\n--- a/drivers/net/mlx5/mlx5_flow_verbs.c\n+++ b/drivers/net/mlx5/mlx5_flow_verbs.c\n@@ -10,7 +10,7 @@\n \n #include <rte_common.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c\nindex bd786fd638..6ffcfcd97a 100644\n--- a/drivers/net/mlx5/mlx5_mac.c\n+++ b/drivers/net/mlx5/mlx5_mac.c\n@@ -11,7 +11,7 @@\n #include <netinet/in.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n \n #include \"mlx5_defs.h\"\ndiff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c\nindex 845cebe2e8..dc0131af3a 100644\n--- a/drivers/net/mlx5/mlx5_rss.c\n+++ b/drivers/net/mlx5/mlx5_rss.c\n@@ -9,7 +9,7 @@\n #include <string.h>\n \n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include <mlx5_malloc.h>\n \ndiff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c\nindex 7613ff770d..cf93ccac86 100644\n--- a/drivers/net/mlx5/mlx5_rxmode.c\n+++ b/drivers/net/mlx5/mlx5_rxmode.c\n@@ -7,7 +7,7 @@\n #include <errno.h>\n #include <string.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include <mlx5_glue.h>\n #include \"mlx5.h\"\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 787b2b74dd..92e3a792e1 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -12,7 +12,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n #include <rte_interrupts.h>\n #include <rte_debug.h>\ndiff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c\nindex 82d4d4a745..a6569b250a 100644\n--- a/drivers/net/mlx5/mlx5_stats.c\n+++ b/drivers/net/mlx5/mlx5_stats.c\n@@ -8,7 +8,7 @@\n #include <stdio.h>\n #include <unistd.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n #include <rte_malloc.h>\n \ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex 48210bf0b2..94dd56709e 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -6,7 +6,7 @@\n #include <unistd.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_interrupts.h>\n #include <rte_alarm.h>\n #include <rte_cycles.h>\ndiff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c\nindex b38482d4e9..696282ca31 100644\n--- a/drivers/net/mlx5/mlx5_txpp.c\n+++ b/drivers/net/mlx5/mlx5_txpp.c\n@@ -5,7 +5,7 @@\n #include <stdint.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_interrupts.h>\n #include <rte_alarm.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c\nindex b81bb4a12d..5142e50858 100644\n--- a/drivers/net/mlx5/mlx5_txq.c\n+++ b/drivers/net/mlx5/mlx5_txq.c\n@@ -12,7 +12,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n #include <rte_eal_paging.h>\n \ndiff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c\nindex dbb9d362f3..64678d3f51 100644\n--- a/drivers/net/mlx5/mlx5_vlan.c\n+++ b/drivers/net/mlx5/mlx5_vlan.c\n@@ -8,7 +8,7 @@\n #include <stdint.h>\n #include <unistd.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n #include <rte_malloc.h>\n #include <rte_hypervisor.h>\ndiff --git a/drivers/net/mlx5/windows/mlx5_ethdev_os.c b/drivers/net/mlx5/windows/mlx5_ethdev_os.c\nindex 076c688699..8609d38eca 100644\n--- a/drivers/net/mlx5/windows/mlx5_ethdev_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_ethdev_os.c\n@@ -5,7 +5,7 @@\n \n #include <rte_errno.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_interrupts.h>\n \n #include <mlx5_glue.h>\ndiff --git a/drivers/net/mlx5/windows/mlx5_mp_os.c b/drivers/net/mlx5/windows/mlx5_mp_os.c\nindex db793b1f7d..8313c29ffb 100644\n--- a/drivers/net/mlx5/windows/mlx5_mp_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_mp_os.c\n@@ -6,7 +6,7 @@\n #include <time.h>\n \n #include <rte_eal.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_string_fns.h>\n \n #include <mlx5_common_mp.h>\ndiff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c\nindex b036432937..e37cc65c17 100644\n--- a/drivers/net/mlx5/windows/mlx5_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_os.c\n@@ -9,7 +9,7 @@\n #include <stdlib.h>\n \n #include <rte_windows.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n \n #include <mlx5_glue.h>\n #include <mlx5_devx_cmds.h>\ndiff --git a/drivers/net/mlx5/windows/mlx5_vlan_os.c b/drivers/net/mlx5/windows/mlx5_vlan_os.c\nindex d3b11e0001..3917c822e4 100644\n--- a/drivers/net/mlx5/windows/mlx5_vlan_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_vlan_os.c\n@@ -13,7 +13,7 @@\n  */\n #include <sys/types.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_common.h>\n \n #include <mlx5.h>\ndiff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c\nindex 2cd73919ce..b0940b4462 100644\n--- a/drivers/net/mvneta/mvneta_ethdev.c\n+++ b/drivers/net/mvneta/mvneta_ethdev.c\n@@ -5,7 +5,7 @@\n  */\n \n #include <rte_string_fns.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_kvargs.h>\n #include <rte_bus_vdev.h>\n \ndiff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c\nindex f25cf9e46d..1d67f2abf1 100644\n--- a/drivers/net/mvpp2/mrvl_ethdev.c\n+++ b/drivers/net/mvpp2/mrvl_ethdev.c\n@@ -5,7 +5,7 @@\n  */\n \n #include <rte_string_fns.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_kvargs.h>\n #include <rte_log.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c\nindex 5a401b4b06..04904b1514 100644\n--- a/drivers/net/netvsc/hn_ethdev.c\n+++ b/drivers/net/netvsc/hn_ethdev.c\n@@ -24,7 +24,7 @@\n #include <rte_atomic.h>\n #include <rte_branch_prediction.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_cycles.h>\n #include <rte_errno.h>\n #include <rte_memory.h>\ndiff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c\nindex 1ce260c89b..e317539de7 100644\n--- a/drivers/net/netvsc/hn_rndis.c\n+++ b/drivers/net/netvsc/hn_rndis.c\n@@ -12,7 +12,7 @@\n #include <unistd.h>\n #include <time.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ethdev.h>\n #include <rte_string_fns.h>\n #include <rte_memzone.h>\ndiff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c\nindex 86392917c5..2dc7abe354 100644\n--- a/drivers/net/netvsc/hn_vf.c\n+++ b/drivers/net/netvsc/hn_vf.c\n@@ -16,7 +16,7 @@\n \n #include <rte_ether.h>\n #include <rte_ethdev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_lcore.h>\n #include <rte_memory.h>\n #include <rte_bus_vmbus.h>\ndiff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c\nindex c55bcdf1ef..7e91d59847 100644\n--- a/drivers/net/nfb/nfb_ethdev.c\n+++ b/drivers/net/nfb/nfb_ethdev.c\n@@ -9,7 +9,7 @@\n #include <netcope/rxmac.h>\n #include <netcope/txmac.h>\n \n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_kvargs.h>\n \n #include \"nfb_stats.h\"\ndiff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h\nindex b6578cc38a..28daeae0b8 100644\n--- a/drivers/net/nfb/nfb_tx.h\n+++ b/drivers/net/nfb/nfb_tx.h\n@@ -10,7 +10,7 @@\n #include <nfb/nfb.h>\n #include <nfb/ndp.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ethdev.h>\n #include <rte_malloc.h>\n \ndiff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c\nindex 9ea24e5bda..9927c9c44b 100644\n--- a/drivers/net/nfp/nfp_net.c\n+++ b/drivers/net/nfp/nfp_net.c\n@@ -17,8 +17,8 @@\n #include <rte_common.h>\n #include <rte_log.h>\n #include <rte_debug.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_dev.h>\n #include <rte_ether.h>\n #include <rte_malloc.h>\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex 1427954c17..78f7b8ca2f 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -6,7 +6,7 @@\n #ifndef __NFP_CPP_H__\n #define __NFP_CPP_H__\n \n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n \n #include \"nfp-common/nfp_platform.h\"\n #include \"nfp-common/nfp_resid.h\"\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\nindex 36725d69ab..bad80a5a1c 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n@@ -33,7 +33,7 @@\n #include <sys/file.h>\n #include <sys/stat.h>\n \n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_string_fns.h>\n \n #include \"nfp_cpp.h\"\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex dec4a8b6d1..848c452eab 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -12,7 +12,7 @@\n #include <sys/types.h>\n \n #include <rte_byteorder.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n \n #include \"nfp_cpp.h\"\n #include \"nfp_target.h\"\ndiff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c\nindex 49ee8da8e4..32764e8f0e 100644\n--- a/drivers/net/null/rte_eth_null.c\n+++ b/drivers/net/null/rte_eth_null.c\n@@ -4,8 +4,8 @@\n  */\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_bus_vdev.h>\ndiff --git a/drivers/net/octeontx/octeontx_ethdev.h b/drivers/net/octeontx/octeontx_ethdev.h\nindex 780a094ffa..b73515de37 100644\n--- a/drivers/net/octeontx/octeontx_ethdev.h\n+++ b/drivers/net/octeontx/octeontx_ethdev.h\n@@ -8,7 +8,7 @@\n #include <stdbool.h>\n \n #include <rte_common.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_eventdev.h>\n #include <rte_mempool.h>\n #include <rte_memory.h>\ndiff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c\nindex bbe43a874b..61865ef0bc 100644\n--- a/drivers/net/octeontx/octeontx_rxtx.c\n+++ b/drivers/net/octeontx/octeontx_rxtx.c\n@@ -9,7 +9,7 @@\n \n #include <rte_atomic.h>\n #include <rte_common.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_log.h>\n #include <rte_mbuf.h>\ndiff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h\nindex 7c24d8b4fd..2ed28ea563 100644\n--- a/drivers/net/octeontx/octeontx_rxtx.h\n+++ b/drivers/net/octeontx/octeontx_rxtx.h\n@@ -5,7 +5,7 @@\n #ifndef\t__OCTEONTX_RXTX_H__\n #define\t__OCTEONTX_RXTX_H__\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #define OFFLOAD_FLAGS\t\t\t\t\t\\\n \tuint16_t rx_offload_flags;\t\t\t\\\ndiff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c\nindex 9bfe95d6b1..e9fbbca4da 100644\n--- a/drivers/net/octeontx2/otx2_ethdev.c\n+++ b/drivers/net/octeontx2/otx2_ethdev.c\n@@ -4,7 +4,7 @@\n \n #include <inttypes.h>\n \n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_io.h>\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\ndiff --git a/drivers/net/octeontx2/otx2_link.c b/drivers/net/octeontx2/otx2_link.c\nindex 439ec4fa89..a79b997376 100644\n--- a/drivers/net/octeontx2/otx2_link.c\n+++ b/drivers/net/octeontx2/otx2_link.c\n@@ -3,7 +3,7 @@\n  */\n \n #include <rte_common.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n \n #include \"otx2_ethdev.h\"\n \ndiff --git a/drivers/net/octeontx2/otx2_ptp.c b/drivers/net/octeontx2/otx2_ptp.c\nindex b8ef4c181d..91e5c0f6bd 100644\n--- a/drivers/net/octeontx2/otx2_ptp.c\n+++ b/drivers/net/octeontx2/otx2_ptp.c\n@@ -2,7 +2,7 @@\n  * Copyright(C) 2019 Marvell International Ltd.\n  */\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"otx2_ethdev.h\"\n \ndiff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c\nindex a32b1f3f37..ff02ade70d 100644\n--- a/drivers/net/pcap/rte_eth_pcap.c\n+++ b/drivers/net/pcap/rte_eth_pcap.c\n@@ -19,8 +19,8 @@\n #include <pcap.h>\n \n #include <rte_cycles.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_kvargs.h>\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\ndiff --git a/drivers/net/pfe/pfe_eth.h b/drivers/net/pfe/pfe_eth.h\nindex 9820d7bf47..fbc11b4ffb 100644\n--- a/drivers/net/pfe/pfe_eth.h\n+++ b/drivers/net/pfe/pfe_eth.h\n@@ -7,7 +7,7 @@\n \n #include <compat.h>\n #include <rte_ethdev.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_vdev.h>\n \n #define ETH_ALEN 6\n #define GEMAC_NO_PHY            BIT(0)\ndiff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c\nindex 3b079693fb..8cf59e210d 100644\n--- a/drivers/net/pfe/pfe_ethdev.c\n+++ b/drivers/net/pfe/pfe_ethdev.c\n@@ -5,7 +5,7 @@\n #include <sys/ioctl.h>\n #include <sys/epoll.h>\n #include <rte_kvargs.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_vdev.h>\n #include <rte_bus_vdev.h>\n #include <rte_ether.h>\n #include <dpaa_of.h>\ndiff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h\nindex 61a65ac42e..da4b87f5e2 100644\n--- a/drivers/net/qede/qede_ethdev.h\n+++ b/drivers/net/qede/qede_ethdev.h\n@@ -11,8 +11,8 @@\n #include <sys/queue.h>\n \n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_dev.h>\n #include <rte_ip.h>\n \ndiff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c\nindex 41402a5159..472d838582 100644\n--- a/drivers/net/ring/rte_eth_ring.c\n+++ b/drivers/net/ring/rte_eth_ring.c\n@@ -4,7 +4,7 @@\n \n #include \"rte_eth_ring.h\"\n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\ndiff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex ed059e142f..fdee800482 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -14,7 +14,7 @@\n \n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_kvargs.h>\n #include <rte_spinlock.h>\n #include <rte_atomic.h>\ndiff --git a/drivers/net/sfc/sfc_dp_rx.h b/drivers/net/sfc/sfc_dp_rx.h\nindex f3e00e2e38..f20154b568 100644\n--- a/drivers/net/sfc/sfc_dp_rx.h\n+++ b/drivers/net/sfc/sfc_dp_rx.h\n@@ -11,7 +11,7 @@\n #define _SFC_DP_RX_H\n \n #include <rte_mempool.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"sfc_dp.h\"\n \ndiff --git a/drivers/net/sfc/sfc_dp_tx.h b/drivers/net/sfc/sfc_dp_tx.h\nindex 3ecdfcdd28..b4af68984a 100644\n--- a/drivers/net/sfc/sfc_dp_tx.h\n+++ b/drivers/net/sfc/sfc_dp_tx.h\n@@ -10,7 +10,7 @@\n #ifndef _SFC_DP_TX_H\n #define _SFC_DP_TX_H\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"sfc_dp.h\"\n #include \"sfc_debug.h\"\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex f2f5336435..d6f6a84eab 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -8,8 +8,8 @@\n  */\n \n #include <rte_dev.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_errno.h>\ndiff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h\nindex 3c7e5580e2..03bfb14b5c 100644\n--- a/drivers/net/sfc/sfc_ev.h\n+++ b/drivers/net/sfc/sfc_ev.h\n@@ -10,7 +10,7 @@\n #ifndef _SFC_EV_H_\n #define _SFC_EV_H_\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"efx.h\"\n \ndiff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex 4321045d1a..ab1d2cc595 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -10,7 +10,7 @@\n #include <rte_byteorder.h>\n #include <rte_tailq.h>\n #include <rte_common.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\ndiff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h\nindex d6ee9cf802..0d64b9c8bb 100644\n--- a/drivers/net/sfc/sfc_rx.h\n+++ b/drivers/net/sfc/sfc_rx.h\n@@ -12,7 +12,7 @@\n \n #include <rte_mbuf.h>\n #include <rte_mempool.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"efx.h\"\n \ndiff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h\nindex d583ee9c3d..3367bade37 100644\n--- a/drivers/net/sfc/sfc_tx.h\n+++ b/drivers/net/sfc/sfc_tx.h\n@@ -11,7 +11,7 @@\n #define _SFC_TX_H\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #include \"efx.h\"\n \ndiff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c\nindex 3387ab485f..99d8468c94 100644\n--- a/drivers/net/softnic/rte_eth_softnic.c\n+++ b/drivers/net/softnic/rte_eth_softnic.c\n@@ -6,8 +6,8 @@\n #include <stdlib.h>\n #include <string.h>\n \n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_bus_vdev.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h\nindex 9c8737c9e2..faf90a5a8c 100644\n--- a/drivers/net/softnic/rte_eth_softnic_internals.h\n+++ b/drivers/net/softnic/rte_eth_softnic_internals.h\n@@ -19,7 +19,7 @@\n #include <rte_pipeline.h>\n \n #include <rte_ethdev_core.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_tm_driver.h>\n #include <rte_flow_driver.h>\n #include <rte_mtr_driver.h>\ndiff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c\nindex 7874c4f4f8..6eaeadf1c8 100644\n--- a/drivers/net/szedata2/rte_eth_szedata2.c\n+++ b/drivers/net/szedata2/rte_eth_szedata2.c\n@@ -15,8 +15,8 @@\n #include <libsze2.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex 2542de3065..c36d4bf76e 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -7,8 +7,8 @@\n #include <rte_byteorder.h>\n #include <rte_common.h>\n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_bus_vdev.h>\n #include <rte_kvargs.h>\ndiff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h\nindex ba45de8409..a98ea11a33 100644\n--- a/drivers/net/tap/rte_eth_tap.h\n+++ b/drivers/net/tap/rte_eth_tap.h\n@@ -13,7 +13,7 @@\n \n #include <linux/if_tun.h>\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_gso.h>\n #include \"tap_log.h\"\ndiff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c\nindex c2e7c334d4..c45d6e00a9 100644\n--- a/drivers/net/thunderx/nicvf_ethdev.c\n+++ b/drivers/net/thunderx/nicvf_ethdev.c\n@@ -23,8 +23,8 @@\n #include <rte_dev.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_interrupts.h>\n #include <rte_log.h>\n #include <rte_memory.h>\ndiff --git a/drivers/net/thunderx/nicvf_ethdev.h b/drivers/net/thunderx/nicvf_ethdev.h\nindex 3914117997..b8dd905d0b 100644\n--- a/drivers/net/thunderx/nicvf_ethdev.h\n+++ b/drivers/net/thunderx/nicvf_ethdev.h\n@@ -5,7 +5,7 @@\n #ifndef __THUNDERX_NICVF_ETHDEV_H__\n #define __THUNDERX_NICVF_ETHDEV_H__\n \n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #define THUNDERX_NICVF_PMD_VERSION      \"2.0\"\n #define THUNDERX_REG_BYTES\t\t8\ndiff --git a/drivers/net/thunderx/nicvf_rxtx.c b/drivers/net/thunderx/nicvf_rxtx.c\nindex d0ea95f1d1..91e09ff8d5 100644\n--- a/drivers/net/thunderx/nicvf_rxtx.c\n+++ b/drivers/net/thunderx/nicvf_rxtx.c\n@@ -13,7 +13,7 @@\n #include <rte_common.h>\n #include <rte_cycles.h>\n #include <rte_errno.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_ether.h>\n #include <rte_log.h>\n #include <rte_mbuf.h>\ndiff --git a/drivers/net/thunderx/nicvf_rxtx.h b/drivers/net/thunderx/nicvf_rxtx.h\nindex 1f274b2954..d6ed660b4e 100644\n--- a/drivers/net/thunderx/nicvf_rxtx.h\n+++ b/drivers/net/thunderx/nicvf_rxtx.h\n@@ -6,7 +6,7 @@\n #define __THUNDERX_NICVF_RXTX_H__\n \n #include <rte_byteorder.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n #define NICVF_RX_OFFLOAD_NONE           0x1\n #define NICVF_RX_OFFLOAD_CKSUM          0x2\ndiff --git a/drivers/net/thunderx/nicvf_struct.h b/drivers/net/thunderx/nicvf_struct.h\nindex cf1c281a06..0ca207d0dd 100644\n--- a/drivers/net/thunderx/nicvf_struct.h\n+++ b/drivers/net/thunderx/nicvf_struct.h\n@@ -11,7 +11,7 @@\n #include <rte_mempool.h>\n #include <rte_mbuf.h>\n #include <rte_interrupts.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_memory.h>\n \n struct nicvf_rbdr {\ndiff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c\nindex eef4b6d4a5..23f9d17091 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.c\n+++ b/drivers/net/txgbe/txgbe_ethdev.c\n@@ -7,7 +7,7 @@\n #include <stdint.h>\n #include <string.h>\n #include <rte_common.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n \n #include <rte_interrupts.h>\n #include <rte_log.h>\ndiff --git a/drivers/net/txgbe/txgbe_ipsec.c b/drivers/net/txgbe/txgbe_ipsec.c\nindex daa523b204..9f4eee4081 100644\n--- a/drivers/net/txgbe/txgbe_ipsec.c\n+++ b/drivers/net/txgbe/txgbe_ipsec.c\n@@ -2,7 +2,7 @@\n  * Copyright(c) 2015-2020\n  */\n \n-#include <rte_ethdev_pci.h>\n+#include <ethdev_pci.h>\n #include <rte_security_driver.h>\n #include <rte_cryptodev.h>\n \ndiff --git a/drivers/net/txgbe/txgbe_pf.c b/drivers/net/txgbe/txgbe_pf.c\nindex 151f2c7a45..e4bd990b96 100644\n--- a/drivers/net/txgbe/txgbe_pf.c\n+++ b/drivers/net/txgbe/txgbe_pf.c\n@@ -15,7 +15,7 @@\n #include <rte_debug.h>\n #include <rte_eal.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_memcpy.h>\n #include <rte_malloc.h>\n #include <rte_random.h>\ndiff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c\nindex 3ad92248c6..ac09e75a3e 100644\n--- a/drivers/net/txgbe/txgbe_rxtx.c\n+++ b/drivers/net/txgbe/txgbe_rxtx.c\n@@ -19,7 +19,7 @@\n #include <rte_log.h>\n #include <rte_debug.h>\n #include <rte_ethdev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_security_driver.h>\n #include <rte_memzone.h>\n #include <rte_atomic.h>\ndiff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c\nindex 5845bb15f3..d198fc8a8e 100644\n--- a/drivers/net/vhost/rte_eth_vhost.c\n+++ b/drivers/net/vhost/rte_eth_vhost.c\n@@ -8,8 +8,8 @@\n #include <sys/epoll.h>\n \n #include <rte_mbuf.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_vdev.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_bus_vdev.h>\ndiff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 92a3d4efa5..edcd6203d9 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -8,8 +8,8 @@\n #include <errno.h>\n #include <unistd.h>\n \n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_memcpy.h>\n #include <rte_string_fns.h>\n #include <rte_memzone.h>\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex ab61e911b8..0382dc5b2c 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -10,7 +10,7 @@\n \n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n struct virtqueue;\n struct virtnet_ctl;\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 622d4bf201..fb7382eff7 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -15,7 +15,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_prefetch.h>\n #include <rte_string_fns.h>\n #include <rte_errno.h>\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.c b/drivers/net/virtio/virtio_rxtx_simple.c\nindex a26182bb46..f248869a8f 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple.c\n@@ -15,7 +15,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_prefetch.h>\n #include <rte_string_fns.h>\n #include <rte_errno.h>\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_altivec.c b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\nindex a260ebdf57..f09a1eda49 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n@@ -14,7 +14,7 @@\n #include <rte_branch_prediction.h>\n #include <rte_cycles.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_errno.h>\n #include <rte_memory.h>\n #include <rte_mempool.h>\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c\nindex 12e034dc0a..2cba800807 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_neon.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c\n@@ -12,7 +12,7 @@\n #include <rte_branch_prediction.h>\n #include <rte_cycles.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_errno.h>\n #include <rte_memory.h>\n #include <rte_mempool.h>\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_sse.c b/drivers/net/virtio/virtio_rxtx_simple_sse.c\nindex 1056e9c20b..85a5a6664a 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_sse.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_sse.c\n@@ -14,7 +14,7 @@\n #include <rte_branch_prediction.h>\n #include <rte_cycles.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_errno.h>\n #include <rte_memory.h>\n #include <rte_mempool.h>\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex 241808cd8f..308275b70e 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -13,7 +13,7 @@\n \n #include <rte_malloc.h>\n #include <rte_kvargs.h>\n-#include <rte_ethdev_vdev.h>\n+#include <ethdev_vdev.h>\n #include <rte_bus_vdev.h>\n #include <rte_alarm.h>\n #include <rte_cycles.h>\ndiff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c\nindex 23a2ebbefa..ecdecc427c 100644\n--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c\n+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c\n@@ -26,8 +26,8 @@\n #include <rte_eal.h>\n #include <rte_alarm.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_ethdev_pci.h>\n+#include <ethdev_driver.h>\n+#include <ethdev_pci.h>\n #include <rte_string_fns.h>\n #include <rte_malloc.h>\n #include <rte_dev.h>\ndiff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c\nindex 95c697f8e3..5cf53d4de8 100644\n--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c\n+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c\n@@ -32,7 +32,7 @@\n #include <rte_malloc.h>\n #include <rte_mbuf.h>\n #include <rte_ether.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n #include <rte_prefetch.h>\n #include <rte_ip.h>\n #include <rte_udp.h>\ndiff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/ethdev_driver.h\nsimilarity index 100%\nrename from lib/librte_ethdev/rte_ethdev_driver.h\nrename to lib/librte_ethdev/ethdev_driver.h\ndiff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/ethdev_pci.h\nsimilarity index 99%\nrename from lib/librte_ethdev/rte_ethdev_pci.h\nrename to lib/librte_ethdev/ethdev_pci.h\nindex bf715896ae..8edca82ce8 100644\n--- a/lib/librte_ethdev/rte_ethdev_pci.h\n+++ b/lib/librte_ethdev/ethdev_pci.h\n@@ -10,7 +10,7 @@\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n #include <rte_config.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n /**\n  * Copy pci device info to the Ethernet device data.\ndiff --git a/lib/librte_ethdev/ethdev_private.c b/lib/librte_ethdev/ethdev_private.c\nindex 162a502fe7..5960c75cc5 100644\n--- a/lib/librte_ethdev/ethdev_private.c\n+++ b/lib/librte_ethdev/ethdev_private.c\n@@ -3,7 +3,7 @@\n  */\n \n #include \"rte_ethdev.h\"\n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"ethdev_private.h\"\n \n uint16_t\ndiff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/ethdev_vdev.h\nsimilarity index 97%\nrename from lib/librte_ethdev/rte_ethdev_vdev.h\nrename to lib/librte_ethdev/ethdev_vdev.h\nindex 4ba3f28964..46c75d9e5f 100644\n--- a/lib/librte_ethdev/rte_ethdev_vdev.h\n+++ b/lib/librte_ethdev/ethdev_vdev.h\n@@ -9,7 +9,7 @@\n #include <rte_config.h>\n #include <rte_malloc.h>\n #include <rte_bus_vdev.h>\n-#include <rte_ethdev_driver.h>\n+#include <ethdev_driver.h>\n \n /**\n  * @internal\ndiff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build\nindex e4b610246f..829abd456b 100644\n--- a/lib/librte_ethdev/meson.build\n+++ b/lib/librte_ethdev/meson.build\n@@ -11,12 +11,9 @@ sources = files('ethdev_private.c',\n \t'rte_tm.c')\n \n headers = files('rte_ethdev.h',\n-\t'rte_ethdev_driver.h',\n \t'rte_ethdev_core.h',\n-\t'rte_ethdev_pci.h',\n \t'rte_ethdev_trace.h',\n \t'rte_ethdev_trace_fp.h',\n-\t'rte_ethdev_vdev.h',\n \t'rte_eth_ctrl.h',\n \t'rte_dev_info.h',\n \t'rte_flow.h',\ndiff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c\nindex 6338355e25..ca2ce87f7a 100644\n--- a/lib/librte_ethdev/rte_class_eth.c\n+++ b/lib/librte_ethdev/rte_class_eth.c\n@@ -12,7 +12,7 @@\n \n #include \"rte_ethdev.h\"\n #include \"rte_ethdev_core.h\"\n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"ethdev_private.h\"\n \n enum eth_params {\ndiff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c\nindex daf5f24f7e..f40df65e34 100644\n--- a/lib/librte_ethdev/rte_ethdev.c\n+++ b/lib/librte_ethdev/rte_ethdev.c\n@@ -41,7 +41,7 @@\n \n #include \"rte_ethdev_trace.h\"\n #include \"rte_ethdev.h\"\n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"ethdev_profile.h\"\n #include \"ethdev_private.h\"\n \ndiff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h\nindex eb299955d4..89b8ba2fc4 100644\n--- a/lib/librte_ethdev/rte_ethdev.h\n+++ b/lib/librte_ethdev/rte_ethdev.h\n@@ -20,7 +20,7 @@\n  * - The driver-oriented Ethernet API that exports functions allowing\n  *   an Ethernet Poll Mode Driver (PMD) to allocate an Ethernet device instance,\n  *   create memzone for HW rings and process registered callbacks, and so on.\n- *   PMDs should include rte_ethdev_driver.h instead of this header.\n+ *   PMDs should include ethdev_driver.h instead of this header.\n  *\n  * By default, all the functions of the Ethernet Device API exported by a PMD\n  * are lock-free functions which assume to not be invoked in parallel on\ndiff --git a/lib/librte_ethdev/rte_flow_driver.h b/lib/librte_ethdev/rte_flow_driver.h\nindex f3d72827cc..dabd819d10 100644\n--- a/lib/librte_ethdev/rte_flow_driver.h\n+++ b/lib/librte_ethdev/rte_flow_driver.h\n@@ -18,7 +18,7 @@\n #include <stdint.h>\n \n #include \"rte_ethdev.h\"\n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"rte_flow.h\"\n \n #ifdef __cplusplus\ndiff --git a/lib/librte_ethdev/rte_mtr_driver.h b/lib/librte_ethdev/rte_mtr_driver.h\nindex 3b39532935..a0ddc2b5f4 100644\n--- a/lib/librte_ethdev/rte_mtr_driver.h\n+++ b/lib/librte_ethdev/rte_mtr_driver.h\n@@ -18,7 +18,7 @@\n \n #include <rte_errno.h>\n #include \"rte_ethdev.h\"\n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"rte_mtr.h\"\n \n #ifdef __cplusplus\ndiff --git a/lib/librte_ethdev/rte_tm_driver.h b/lib/librte_ethdev/rte_tm_driver.h\nindex b86ed89c00..45290fb3fd 100644\n--- a/lib/librte_ethdev/rte_tm_driver.h\n+++ b/lib/librte_ethdev/rte_tm_driver.h\n@@ -18,7 +18,7 @@\n \n #include <rte_errno.h>\n #include \"rte_ethdev.h\"\n-#include \"rte_ethdev_driver.h\"\n+#include \"ethdev_driver.h\"\n #include \"rte_tm.h\"\n \n #ifdef __cplusplus\n",
    "prefixes": [
        "v5",
        "3/8"
    ]
}