[ovs-dev] [PATCH] Rename files under datapath-windows

Samuel Ghinet sghinet at cloudbasesolutions.com
Fri Aug 29 04:06:48 UTC 2014


This patch includes the file renaming and accommodations needed for the file
renaming to build the forwarding extension for Hyper-V.

This patch is also a follow-up for the thread:
http://openvswitch.org/pipermail/dev/2014-August/044005.html

The original automake.mk file uses tabs instead of spaces.
This patch also transforms tabs into spaces.

Signed-off-by: Samuel Ghinet <sghinet at cloudbasesolutions.com>
Co-authored-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>
---
 build-aux/extract-odp-netlink-windows-dp-h         |   2 +-
 datapath-windows/automake.mk                       | 126 ++++++++++-----------
 .../ovsext/{OvsActions.c => Actions.c}             |  20 ++--
 datapath-windows/ovsext/{OvsAtomic.h => Atomic.h}  |   6 +-
 .../ovsext/{OvsBufferMgmt.c => BufferMgmt.c}       |  12 +-
 .../ovsext/{OvsBufferMgmt.h => BufferMgmt.h}       |   6 +-
 .../ovsext/{OvsChecksum.c => Checksum.c}           |   8 +-
 .../ovsext/{OvsChecksum.h => Checksum.h}           |   6 +-
 datapath-windows/ovsext/Datapath.c                 |  20 ++--
 datapath-windows/ovsext/Datapath.h                 |   8 +-
 datapath-windows/ovsext/{OvsDebug.c => Debug.c}    |   2 +-
 datapath-windows/ovsext/{OvsDebug.h => Debug.h}    |   6 +-
 datapath-windows/ovsext/{OvsDriver.c => Driver.c}  |   4 +-
 datapath-windows/ovsext/{OvsEth.h => Ethernet.h}   |   6 +-
 datapath-windows/ovsext/{OvsEvent.c => Event.c}    |   8 +-
 datapath-windows/ovsext/{OvsEvent.h => Event.h}    |   6 +-
 datapath-windows/ovsext/{OvsFlow.c => Flow.c}      |  12 +-
 datapath-windows/ovsext/{OvsFlow.h => Flow.h}      |  12 +-
 datapath-windows/ovsext/{OvsIoctl.c => Ioctl.c}    |  22 ++--
 datapath-windows/ovsext/{OvsIoctl.h => Ioctl.h}    |   6 +-
 .../ovsext/{OvsIpHelper.c => IpHelper.c}           |   8 +-
 .../ovsext/{OvsIpHelper.h => IpHelper.h}           |   6 +-
 datapath-windows/ovsext/{OvsJhash.c => Jhash.c}    |   0
 datapath-windows/ovsext/{OvsJhash.h => Jhash.h}    |   6 +-
 .../ovsext/{OvsNetProto.h => NetProto.h}           |   8 +-
 datapath-windows/ovsext/Netlink.c                  |   2 +-
 datapath-windows/ovsext/Netlink.h                  |   2 +-
 datapath-windows/ovsext/NetlinkProto.h             |   4 +-
 datapath-windows/ovsext/{OvsOid.c => Oid.c}        |  18 +--
 datapath-windows/ovsext/{OvsOid.h => Oid.h}        |   6 +-
 .../ovsext/{OvsPacketIO.c => PacketIO.c}           |  18 +--
 .../ovsext/{OvsPacketIO.h => PacketIO.h}           |   6 +-
 .../ovsext/{OvsPacketParser.c => PacketParser.c}   |   2 +-
 .../ovsext/{OvsPacketParser.h => PacketParser.h}   |   8 +-
 datapath-windows/ovsext/{OvsSwitch.c => Switch.c}  |  16 +--
 datapath-windows/ovsext/{OvsSwitch.h => Switch.h}  |  10 +-
 datapath-windows/ovsext/{OvsTunnel.c => Tunnel.c}  |  18 +--
 datapath-windows/ovsext/{OvsTunnel.h => Tunnel.h}  |   6 +-
 .../ovsext/{OvsTunnelFilter.c => TunnelFilter.c}   |  12 +-
 .../ovsext/{OvsTunnelIntf.h => TunnelIntf.h}       |   6 +-
 datapath-windows/ovsext/{OvsTypes.h => Types.h}    |   6 +-
 datapath-windows/ovsext/{OvsUser.c => User.c}      |  20 ++--
 datapath-windows/ovsext/{OvsUser.h => User.h}      |   6 +-
 datapath-windows/ovsext/{OvsUtil.c => Util.c}      |   2 +-
 datapath-windows/ovsext/{OvsUtil.h => Util.h}      |   6 +-
 datapath-windows/ovsext/{OvsVport.c => Vport.c}    |  18 +--
 datapath-windows/ovsext/{OvsVport.h => Vport.h}    |   8 +-
 datapath-windows/ovsext/{OvsVxlan.c => Vxlan.c}    |  26 ++---
 datapath-windows/ovsext/{OvsVxlan.h => Vxlan.h}    |   8 +-
 datapath-windows/ovsext/ovsext.vcxproj             |  85 +++++++-------
 datapath-windows/ovsext/precomp.h                  |   4 +-
 51 files changed, 325 insertions(+), 324 deletions(-)
 rewrite datapath-windows/automake.mk (67%)
 rename datapath-windows/ovsext/{OvsActions.c => Actions.c} (99%)
 rename datapath-windows/ovsext/{OvsAtomic.h => Atomic.h} (91%)
 rename datapath-windows/ovsext/{OvsBufferMgmt.c => BufferMgmt.c} (99%)
 rename datapath-windows/ovsext/{OvsBufferMgmt.h => BufferMgmt.h} (98%)
 rename datapath-windows/ovsext/{OvsChecksum.c => Checksum.c} (99%)
 rename datapath-windows/ovsext/{OvsChecksum.h => Checksum.h} (95%)
 rename datapath-windows/ovsext/{OvsDebug.c => Debug.c} (98%)
 rename datapath-windows/ovsext/{OvsDebug.h => Debug.h} (97%)
 rename datapath-windows/ovsext/{OvsDriver.c => Driver.c} (99%)
 rename datapath-windows/ovsext/{OvsEth.h => Ethernet.h} (99%)
 rename datapath-windows/ovsext/{OvsEvent.c => Event.c} (99%)
 rename datapath-windows/ovsext/{OvsEvent.h => Event.h} (95%)
 rename datapath-windows/ovsext/{OvsFlow.c => Flow.c} (99%)
 rename datapath-windows/ovsext/{OvsFlow.h => Flow.h} (95%)
 rename datapath-windows/ovsext/{OvsIoctl.c => Ioctl.c} (98%)
 rename datapath-windows/ovsext/{OvsIoctl.h => Ioctl.h} (95%)
 rename datapath-windows/ovsext/{OvsIpHelper.c => IpHelper.c} (99%)
 rename datapath-windows/ovsext/{OvsIpHelper.h => IpHelper.h} (97%)
 rename datapath-windows/ovsext/{OvsJhash.c => Jhash.c} (100%)
 rename datapath-windows/ovsext/{OvsJhash.h => Jhash.h} (93%)
 rename datapath-windows/ovsext/{OvsNetProto.h => NetProto.h} (99%)
 rename datapath-windows/ovsext/{OvsOid.c => Oid.c} (99%)
 rename datapath-windows/ovsext/{OvsOid.h => Oid.h} (93%)
 rename datapath-windows/ovsext/{OvsPacketIO.c => PacketIO.c} (98%)
 rename datapath-windows/ovsext/{OvsPacketIO.h => PacketIO.h} (96%)
 rename datapath-windows/ovsext/{OvsPacketParser.c => PacketParser.c} (99%)
 rename datapath-windows/ovsext/{OvsPacketParser.h => PacketParser.h} (97%)
 rename datapath-windows/ovsext/{OvsSwitch.c => Switch.c} (98%)
 rename datapath-windows/ovsext/{OvsSwitch.h => Switch.h} (97%)
 rename datapath-windows/ovsext/{OvsTunnel.c => Tunnel.c} (98%)
 rename datapath-windows/ovsext/{OvsTunnel.h => Tunnel.h} (95%)
 rename datapath-windows/ovsext/{OvsTunnelFilter.c => TunnelFilter.c} (98%)
 rename datapath-windows/ovsext/{OvsTunnelIntf.h => TunnelIntf.h} (89%)
 rename datapath-windows/ovsext/{OvsTypes.h => Types.h} (94%)
 rename datapath-windows/ovsext/{OvsUser.c => User.c} (99%)
 rename datapath-windows/ovsext/{OvsUser.h => User.h} (98%)
 rename datapath-windows/ovsext/{OvsUtil.c => Util.c} (99%)
 rename datapath-windows/ovsext/{OvsUtil.h => Util.h} (97%)
 rename datapath-windows/ovsext/{OvsVport.c => Vport.c} (99%)
 rename datapath-windows/ovsext/{OvsVport.h => Vport.h} (98%)
 rename datapath-windows/ovsext/{OvsVxlan.c => Vxlan.c} (98%)
 rename datapath-windows/ovsext/{OvsVxlan.h => Vxlan.h} (95%)

diff --git a/build-aux/extract-odp-netlink-windows-dp-h b/build-aux/extract-odp-netlink-windows-dp-h
index 041d103..f2d9f07 100755
--- a/build-aux/extract-odp-netlink-windows-dp-h
+++ b/build-aux/extract-odp-netlink-windows-dp-h
@@ -14,7 +14,7 @@
 s/_LINUX_OPENVSWITCH_H/__OVS_DP_INTERFACE_H_/

 # and use the appropriate userspace header.
-s,<linux/types\.h>,"OvsTypes.h",
+s,<linux/types\.h>,"Types.h",

 # Add ETH_ADDR_LEN macro to avoid including userspace packet.h
 s,#include <linux/if_ether\.h>,\n#ifndef ETH_ADDR_LEN \
diff --git a/datapath-windows/automake.mk b/datapath-windows/automake.mk
dissimilarity index 67%
index ace9dc5..f08773e 100644
--- a/datapath-windows/automake.mk
+++ b/datapath-windows/automake.mk
@@ -1,63 +1,63 @@
-EXTRA_DIST += \
-	datapath-windows/CodingStyle \
-	datapath-windows/DESIGN \
-	datapath-windows/Package/package.VcxProj \
-	datapath-windows/Package/package.VcxProj.user \
-	datapath-windows/include/OvsDpInterfaceExt.h \
-	datapath-windows/include/OvsPub.h\
-	datapath-windows/ovsext/Netlink.c \
-	datapath-windows/ovsext/Netlink.h \
-	datapath-windows/ovsext/NetlinkProto.h \
-	datapath-windows/misc/install.cmd \
-	datapath-windows/misc/uninstall.cmd \
-	datapath-windows/ovsext.sln \
-	datapath-windows/ovsext/Datapath.c \
-	datapath-windows/ovsext/Datapath.h \
-	datapath-windows/ovsext/OvsActions.c \
-	datapath-windows/ovsext/OvsAtomic.h \
-	datapath-windows/ovsext/OvsBufferMgmt.c \
-	datapath-windows/ovsext/OvsBufferMgmt.h \
-	datapath-windows/ovsext/OvsChecksum.c \
-	datapath-windows/ovsext/OvsChecksum.h \
-	datapath-windows/ovsext/OvsDebug.c \
-	datapath-windows/ovsext/OvsDebug.h \
-	datapath-windows/ovsext/OvsDriver.c \
-	datapath-windows/ovsext/OvsEth.h \
-	datapath-windows/ovsext/OvsEvent.c \
-	datapath-windows/ovsext/OvsEvent.h \
-	datapath-windows/ovsext/OvsFlow.c \
-	datapath-windows/ovsext/OvsFlow.h \
-	datapath-windows/ovsext/OvsIoctl.c \
-	datapath-windows/ovsext/OvsIoctl.h \
-	datapath-windows/ovsext/OvsIpHelper.c \
-	datapath-windows/ovsext/OvsIpHelper.h \
-	datapath-windows/ovsext/OvsJhash.c \
-	datapath-windows/ovsext/OvsJhash.h \
-	datapath-windows/ovsext/OvsNetProto.h \
-	datapath-windows/ovsext/OvsOid.c \
-	datapath-windows/ovsext/OvsOid.h \
-	datapath-windows/ovsext/OvsPacketIO.c \
-	datapath-windows/ovsext/OvsPacketIO.h \
-	datapath-windows/ovsext/OvsPacketParser.c \
-	datapath-windows/ovsext/OvsPacketParser.h \
-	datapath-windows/ovsext/OvsSwitch.c  \
-	datapath-windows/ovsext/OvsSwitch.h \
-	datapath-windows/ovsext/OvsTunnel.c \
-	datapath-windows/ovsext/OvsTunnel.h \
-	datapath-windows/ovsext/OvsTunnelFilter.c \
-	datapath-windows/ovsext/OvsTunnelIntf.h \
-	datapath-windows/ovsext/OvsTypes.h \
-	datapath-windows/ovsext/OvsUser.c \
-	datapath-windows/ovsext/OvsUser.h \
-	datapath-windows/ovsext/OvsUtil.c  \
-	datapath-windows/ovsext/OvsUtil.h \
-	datapath-windows/ovsext/OvsVport.c \
-	datapath-windows/ovsext/OvsVport.h \
-	datapath-windows/ovsext/OvsVxlan.c \
-	datapath-windows/ovsext/OvsVxlan.h \
-	datapath-windows/ovsext/ovsext.inf \
-	datapath-windows/ovsext/ovsext.rc \
-	datapath-windows/ovsext/ovsext.vcxproj \
-	datapath-windows/ovsext/ovsext.vcxproj.user \
-	datapath-windows/ovsext/precomp.h \
-	datapath-windows/ovsext/precompsrc.c
+EXTRA_DIST += \
+       datapath-windows/CodingStyle \
+       datapath-windows/DESIGN \
+       datapath-windows/Package/package.VcxProj \
+       datapath-windows/Package/package.VcxProj.user \
+       datapath-windows/include/OvsDpInterfaceExt.h \
+       datapath-windows/include/OvsPub.h\
+       datapath-windows/ovsext/Netlink.c \
+       datapath-windows/ovsext/Netlink.h \
+       datapath-windows/ovsext/NetlinkProto.h \
+       datapath-windows/misc/install.cmd \
+       datapath-windows/misc/uninstall.cmd \
+       datapath-windows/ovsext.sln \
+       datapath-windows/ovsext/Datapath.c \
+       datapath-windows/ovsext/Datapath.h \
+       datapath-windows/ovsext/Actions.c \
+       datapath-windows/ovsext/Atomic.h \
+       datapath-windows/ovsext/BufferMgmt.c \
+       datapath-windows/ovsext/BufferMgmt.h \
+       datapath-windows/ovsext/Checksum.c \
+       datapath-windows/ovsext/Checksum.h \
+       datapath-windows/ovsext/Debug.c \
+       datapath-windows/ovsext/Debug.h \
+       datapath-windows/ovsext/Driver.c \
+       datapath-windows/ovsext/Ethernet.h \
+       datapath-windows/ovsext/Event.c \
+       datapath-windows/ovsext/Event.h \
+       datapath-windows/ovsext/Flow.c \
+       datapath-windows/ovsext/Flow.h \
+       datapath-windows/ovsext/Ioctl.c \
+       datapath-windows/ovsext/Ioctl.h \
+       datapath-windows/ovsext/IpHelper.c \
+       datapath-windows/ovsext/IpHelper.h \
+       datapath-windows/ovsext/Jhash.c \
+       datapath-windows/ovsext/Jhash.h \
+       datapath-windows/ovsext/NetProto.h \
+       datapath-windows/ovsext/Oid.c \
+       datapath-windows/ovsext/Oid.h \
+       datapath-windows/ovsext/PacketIO.c \
+       datapath-windows/ovsext/PacketIO.h \
+       datapath-windows/ovsext/PacketParser.c \
+       datapath-windows/ovsext/PacketParser.h \
+       datapath-windows/ovsext/Switch.c  \
+       datapath-windows/ovsext/Switch.h \
+       datapath-windows/ovsext/Tunnel.c \
+       datapath-windows/ovsext/Tunnel.h \
+       datapath-windows/ovsext/TunnelFilter.c \
+       datapath-windows/ovsext/TunnelIntf.h \
+       datapath-windows/ovsext/Types.h \
+       datapath-windows/ovsext/User.c \
+       datapath-windows/ovsext/User.h \
+       datapath-windows/ovsext/Util.c  \
+       datapath-windows/ovsext/Util.h \
+       datapath-windows/ovsext/Vport.c \
+       datapath-windows/ovsext/Vport.h \
+       datapath-windows/ovsext/Vxlan.c \
+       datapath-windows/ovsext/Vxlan.h \
+       datapath-windows/ovsext/ovsext.inf \
+       datapath-windows/ovsext/ovsext.rc \
+       datapath-windows/ovsext/ovsext.vcxproj \
+       datapath-windows/ovsext/ovsext.vcxproj.user \
+       datapath-windows/ovsext/precomp.h \
+       datapath-windows/ovsext/precompsrc.c
diff --git a/datapath-windows/ovsext/OvsActions.c b/datapath-windows/ovsext/Actions.c
similarity index 99%
rename from datapath-windows/ovsext/OvsActions.c
rename to datapath-windows/ovsext/Actions.c
index d8fd295..35ebfdf 100644
--- a/datapath-windows/ovsext/OvsActions.c
+++ b/datapath-windows/ovsext/Actions.c
@@ -16,21 +16,21 @@

 #include "precomp.h"

-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsNetProto.h"
-#include "OvsFlow.h"
-#include "OvsVxlan.h"
-#include "OvsChecksum.h"
-#include "OvsPacketIO.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "User.h"
+#include "NetProto.h"
+#include "Flow.h"
+#include "Vxlan.h"
+#include "Checksum.h"
+#include "PacketIO.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_ACTION
-#include "OvsDebug.h"
+#include "Debug.h"

 typedef struct _OVS_ACTION_STATS {
     UINT64 rxVxlan;
diff --git a/datapath-windows/ovsext/OvsAtomic.h b/datapath-windows/ovsext/Atomic.h
similarity index 91%
rename from datapath-windows/ovsext/OvsAtomic.h
rename to datapath-windows/ovsext/Atomic.h
index a94d1fb..1e45d9f 100644
--- a/datapath-windows/ovsext/OvsAtomic.h
+++ b/datapath-windows/ovsext/Atomic.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_ATOMIC_H_
-#define __OVS_ATOMIC_H_ 1
+#ifndef __ATOMIC_H_
+#define __ATOMIC_H_ 1

 static __inline UINT64
 atomic_add64(UINT64 *ptr, UINT32 val)
@@ -29,4 +29,4 @@ atomic_inc64(UINT64 *ptr)
     return InterlockedIncrement64((LONGLONG volatile *) ptr);
 }

-#endif /* __OVS_ATOMIC_H_ */
+#endif /* __ATOMIC_H_ */
diff --git a/datapath-windows/ovsext/OvsBufferMgmt.c b/datapath-windows/ovsext/BufferMgmt.c
similarity index 99%
rename from datapath-windows/ovsext/OvsBufferMgmt.c
rename to datapath-windows/ovsext/BufferMgmt.c
index 8aa8060..e0377c1 100644
--- a/datapath-windows/ovsext/OvsBufferMgmt.c
+++ b/datapath-windows/ovsext/BufferMgmt.c
@@ -77,17 +77,17 @@
  */

 #include "precomp.h"
-#include "OvsSwitch.h"
+#include "Switch.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_BUFMGMT
-#include "OvsDebug.h"
-#include "OvsNetProto.h"
-#include "OvsFlow.h"
-#include "OvsChecksum.h"
-#include "OvsPacketParser.h"
+#include "Debug.h"
+#include "NetProto.h"
+#include "Flow.h"
+#include "Checksum.h"
+#include "PacketParser.h"

 /*
  * --------------------------------------------------------------------------
diff --git a/datapath-windows/ovsext/OvsBufferMgmt.h b/datapath-windows/ovsext/BufferMgmt.h
similarity index 98%
rename from datapath-windows/ovsext/OvsBufferMgmt.h
rename to datapath-windows/ovsext/BufferMgmt.h
index 9c00b1b..915d7f5 100644
--- a/datapath-windows/ovsext/OvsBufferMgmt.h
+++ b/datapath-windows/ovsext/BufferMgmt.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_BUFFER_MGMT_H_
-#define __OVS_BUFFER_MGMT_H_ 1
+#ifndef __BUFFER_MGMT_H_
+#define __BUFFER_MGMT_H_ 1

 #define MEM_ALIGN                       MEMORY_ALLOCATION_ALIGNMENT
 #define MEM_ALIGN_SIZE(_x)  ((MEM_ALIGN - 1 + (_x))/MEM_ALIGN * MEM_ALIGN)
@@ -121,4 +121,4 @@ NDIS_STATUS OvsSetCtxSourcePortNo(PNET_BUFFER_LIST nbl, UINT32 portNo);

 NDIS_STATUS OvsGetCtxSourcePortNo(PNET_BUFFER_LIST nbl, UINT32 *portNo);

-#endif /* __OVS_BUFFER_MGMT_H_ */
+#endif /* __BUFFER_MGMT_H_ */
diff --git a/datapath-windows/ovsext/OvsChecksum.c b/datapath-windows/ovsext/Checksum.c
similarity index 99%
rename from datapath-windows/ovsext/OvsChecksum.c
rename to datapath-windows/ovsext/Checksum.c
index e192373..510a094 100644
--- a/datapath-windows/ovsext/OvsChecksum.c
+++ b/datapath-windows/ovsext/Checksum.c
@@ -15,15 +15,15 @@
  */

 #include "precomp.h"
-#include "OvsChecksum.h"
-#include "OvsFlow.h"
+#include "Checksum.h"
+#include "Flow.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_CHECKSUM
-#include "OvsDebug.h"
-#include "OvsPacketParser.h"
+#include "Debug.h"
+#include "PacketParser.h"

 #ifndef htons
 #define htons(_x) (((UINT16)(_x) >> 8) + (((UINT16)(_x) << 8) & 0xff00))
diff --git a/datapath-windows/ovsext/OvsChecksum.h b/datapath-windows/ovsext/Checksum.h
similarity index 95%
rename from datapath-windows/ovsext/OvsChecksum.h
rename to datapath-windows/ovsext/Checksum.h
index d0070d2..2378a32 100644
--- a/datapath-windows/ovsext/OvsChecksum.h
+++ b/datapath-windows/ovsext/Checksum.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_CHECKSUM_H_
-#define __OVS_CHECKSUM_H_ 1
+#ifndef __CHECKSUM_H_
+#define __CHECKSUM_H_ 1

 typedef union _OVS_PACKET_HDR_INFO *POVS_PACKET_HDR_INFO;

@@ -36,4 +36,4 @@ NDIS_STATUS OvsValidateIPChecksum(PNET_BUFFER_LIST curNbl,
 NDIS_STATUS OvsValidateUDPChecksum(PNET_BUFFER_LIST curNbl,
                                    BOOLEAN udpCsumZero);

-#endif /* __OVS_CHECKSUM_H_ */
+#endif /* __CHECKSUM_H_ */
diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c
index 40654f5..5522580 100644
--- a/datapath-windows/ovsext/Datapath.c
+++ b/datapath-windows/ovsext/Datapath.c
@@ -24,21 +24,21 @@

 #include "precomp.h"
 #include "Datapath.h"
-#include "OvsJhash.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsPacketIO.h"
-#include "OvsNetProto.h"
-#include "OvsFlow.h"
-#include "OvsUser.h"
+#include "Jhash.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "User.h"
+#include "PacketIO.h"
+#include "NetProto.h"
+#include "Flow.h"
+#include "User.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_DATAPATH
-#include "OvsDebug.h"
+#include "Debug.h"

 #define NETLINK_FAMILY_NAME_LEN 48

diff --git a/datapath-windows/ovsext/Datapath.h b/datapath-windows/ovsext/Datapath.h
index 6d8a6db..bfbbd71 100644
--- a/datapath-windows/ovsext/Datapath.h
+++ b/datapath-windows/ovsext/Datapath.h
@@ -21,12 +21,12 @@
  * OVS_USE_NL_INTERFACE = 1 => netlink inteface to use with ported dpif-linux.c
  */
 #if defined OVS_USE_NL_INTERFACE && OVS_USE_NL_INTERFACE == 0
-#include "OvsIoctl.h"
+#include "Ioctl.h"

 #else

-#ifndef __OVS_DATAPATH_H_
-#define __OVS_DATAPATH_H_ 1
+#ifndef __DATAPATH_H_
+#define __DATAPATH_H_ 1

 typedef struct _OVS_DEVICE_EXTENSION {
     INT numberOpenInstance;
@@ -77,6 +77,6 @@ typedef struct _OVS_MESSAGE {
     /* Variable length nl_attrs follow. */
 } OVS_MESSAGE, *POVS_MESSAGE;

-#endif /* __OVS_DATAPATH_H_ */
+#endif /* __DATAPATH_H_ */

 #endif /* OVS_USE_NL_INTERFACE */
diff --git a/datapath-windows/ovsext/OvsDebug.c b/datapath-windows/ovsext/Debug.c
similarity index 98%
rename from datapath-windows/ovsext/OvsDebug.c
rename to datapath-windows/ovsext/Debug.c
index 8610008..a96d38d 100644
--- a/datapath-windows/ovsext/OvsDebug.c
+++ b/datapath-windows/ovsext/Debug.c
@@ -16,7 +16,7 @@

 #include "precomp.h"

-#include "OvsDebug.h"
+#include "Debug.h"
 #ifdef DBG
 #define OVS_DBG_DEFAULT  OVS_DBG_INFO
 #else
diff --git a/datapath-windows/ovsext/OvsDebug.h b/datapath-windows/ovsext/Debug.h
similarity index 97%
rename from datapath-windows/ovsext/OvsDebug.h
rename to datapath-windows/ovsext/Debug.h
index a57e73e..cc9787a 100644
--- a/datapath-windows/ovsext/OvsDebug.h
+++ b/datapath-windows/ovsext/Debug.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_DEBUG_H_
-#define __OVS_DEBUG_H_ 1
+#ifndef __DEBUG_H_
+#define __DEBUG_H_ 1

 #define OVS_DBG_INIT     BIT32(0)
 #define OVS_DBG_SWITCH   BIT32(1)
@@ -88,4 +88,4 @@ VOID OvsLog(UINT32 level, UINT32 flag, CHAR *funcName,
 #define OVS_VERIFY_IRQL_LE(_x)
 #endif

-#endif /* __OVS_DEBUG_H_ */
+#endif /* __DEBUG_H_ */
diff --git a/datapath-windows/ovsext/OvsDriver.c b/datapath-windows/ovsext/Driver.c
similarity index 99%
rename from datapath-windows/ovsext/OvsDriver.c
rename to datapath-windows/ovsext/Driver.c
index 1163221..79d2edf 100644
--- a/datapath-windows/ovsext/OvsDriver.c
+++ b/datapath-windows/ovsext/Driver.c
@@ -15,14 +15,14 @@
  */

 #include "precomp.h"
-#include "OvsSwitch.h"
+#include "Switch.h"
 #include "Datapath.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_DRIVER
-#include "OvsDebug.h"
+#include "Debug.h"

 /* Global handles. XXX: Some of them need not be global. */
 /*
diff --git a/datapath-windows/ovsext/OvsEth.h b/datapath-windows/ovsext/Ethernet.h
similarity index 99%
rename from datapath-windows/ovsext/OvsEth.h
rename to datapath-windows/ovsext/Ethernet.h
index 271fd85..22aa27c 100644
--- a/datapath-windows/ovsext/OvsEth.h
+++ b/datapath-windows/ovsext/Ethernet.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_ETH_H_
-#define __OVS_ETH_H_ 1
+#ifndef __ETHERNET_H_
+#define __ETHERNET_H_ 1

 #define ETH_LADRF_LEN      2
 #define ETH_ADDR_LENGTH    6
@@ -447,4 +447,4 @@ Eth_IsFrameTagged(const Eth_Header *eh)
 {
     return (eh->dix.typeNBO == ETH_TYPE_802_1PQ_NBO);
 }
-#endif /* __OVS_ETH_H_ */
+#endif /* __ETHERNET_H_ */
diff --git a/datapath-windows/ovsext/OvsEvent.c b/datapath-windows/ovsext/Event.c
similarity index 99%
rename from datapath-windows/ovsext/OvsEvent.c
rename to datapath-windows/ovsext/Event.c
index d324bc6..fec3485 100644
--- a/datapath-windows/ovsext/OvsEvent.c
+++ b/datapath-windows/ovsext/Event.c
@@ -17,15 +17,15 @@
 #include "precomp.h"

 #include "Datapath.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_EVENT
-#include "OvsDebug.h"
+#include "Debug.h"

 LIST_ENTRY ovsEventQueue;
 UINT32 ovsNumEventQueue;
diff --git a/datapath-windows/ovsext/OvsEvent.h b/datapath-windows/ovsext/Event.h
similarity index 95%
rename from datapath-windows/ovsext/OvsEvent.h
rename to datapath-windows/ovsext/Event.h
index 4ae2ba2..f4801b9 100644
--- a/datapath-windows/ovsext/OvsEvent.h
+++ b/datapath-windows/ovsext/Event.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_EVENT_H_
-#define __OVS_EVENT_H_ 1
+#ifndef __EVENT_H_
+#define __EVENT_H_ 1

 typedef struct _OVS_EVENT_QUEUE_ELEM {
     LIST_ENTRY link;
@@ -47,4 +47,4 @@ NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject, PVOID inputBuffer,
                            UINT32 outputLength, UINT32 *replyLen);
 NTSTATUS OvsWaitEventIoctl(PIRP irp, PFILE_OBJECT fileObject,
                            PVOID inputBuffer, UINT32 inputLength);
-#endif /* __OVS_EVENT_H_ */
+#endif /* __EVENT_H_ */
diff --git a/datapath-windows/ovsext/OvsFlow.c b/datapath-windows/ovsext/Flow.c
similarity index 99%
rename from datapath-windows/ovsext/OvsFlow.c
rename to datapath-windows/ovsext/Flow.c
index 4e31f17..dae1dca 100644
--- a/datapath-windows/ovsext/OvsFlow.c
+++ b/datapath-windows/ovsext/Flow.c
@@ -15,17 +15,17 @@
  */

 #include "precomp.h"
-#include "OvsNetProto.h"
-#include "OvsUtil.h"
-#include "OvsJhash.h"
-#include "OvsFlow.h"
-#include "OvsPacketParser.h"
+#include "NetProto.h"
+#include "Util.h"
+#include "Jhash.h"
+#include "Flow.h"
+#include "PacketParser.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_FLOW
-#include "OvsDebug.h"
+#include "Debug.h"

 #pragma warning( push )
 #pragma warning( disable:4127 )
diff --git a/datapath-windows/ovsext/OvsFlow.h b/datapath-windows/ovsext/Flow.h
similarity index 95%
rename from datapath-windows/ovsext/OvsFlow.h
rename to datapath-windows/ovsext/Flow.h
index fa29c68..3964c54 100644
--- a/datapath-windows/ovsext/OvsFlow.h
+++ b/datapath-windows/ovsext/Flow.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */

-#ifndef __OVS_FLOW_H_
-#define __OVS_FLOW_H_ 1
+#ifndef __FLOW_H_
+#define __FLOW_H_ 1

 #include "precomp.h"
-#include "OvsSwitch.h"
-#include "OvsUser.h"
-#include "OvsNetProto.h"
+#include "Switch.h"
+#include "User.h"
+#include "NetProto.h"

 typedef struct _OvsFlow {
     LIST_ENTRY ListEntry;            // In Datapath's flowTable.
@@ -75,4 +75,4 @@ NTSTATUS OvsFlushFlowIoctl(PVOID inputBuffer, UINT32 inputLength);
 #define OVS_TNL_F_CSUM                  (1 << 1)
 #define OVS_TNL_F_KEY                   (1 << 2)

-#endif /* __OVS_FLOW_H_ */
+#endif /* __FLOW_H_ */
diff --git a/datapath-windows/ovsext/OvsIoctl.c b/datapath-windows/ovsext/Ioctl.c
similarity index 98%
rename from datapath-windows/ovsext/OvsIoctl.c
rename to datapath-windows/ovsext/Ioctl.c
index ef4864d..71e3933 100644
--- a/datapath-windows/ovsext/OvsIoctl.c
+++ b/datapath-windows/ovsext/Ioctl.c
@@ -23,22 +23,22 @@
 #if defined OVS_USE_NL_INTERFACE && OVS_USE_NL_INTERFACE == 0

 #include "precomp.h"
-#include "OvsIoctl.h"
-#include "OvsJhash.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsPacketIO.h"
-#include "OvsNetProto.h"
-#include "OvsFlow.h"
-#include "OvsUser.h"
+#include "Ioctl.h"
+#include "Jhash.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "User.h"
+#include "PacketIO.h"
+#include "NetProto.h"
+#include "Flow.h"
+#include "User.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_DATAPATH
-#include "OvsDebug.h"
+#include "Debug.h"

 /* Handles to the device object for communication with userspace. */
 NDIS_HANDLE gOvsDeviceHandle;
diff --git a/datapath-windows/ovsext/OvsIoctl.h b/datapath-windows/ovsext/Ioctl.h
similarity index 95%
rename from datapath-windows/ovsext/OvsIoctl.h
rename to datapath-windows/ovsext/Ioctl.h
index 5487694..c4f0bd6 100644
--- a/datapath-windows/ovsext/OvsIoctl.h
+++ b/datapath-windows/ovsext/Ioctl.h
@@ -22,8 +22,8 @@
  */
 #if defined OVS_USE_NL_INTERFACE && OVS_USE_NL_INTERFACE == 0

-#ifndef __OVS_IOCTL_H_
-#define __OVS_IOCTL_H_ 1
+#ifndef __IOCTL_H_
+#define __IOCTL_H_ 1

 typedef struct _OVS_DEVICE_EXTENSION {
     INT numberOpenInstance;
@@ -45,6 +45,6 @@ POVS_OPEN_INSTANCE OvsGetOpenInstance(PFILE_OBJECT fileObject,

 NTSTATUS OvsCompleteIrpRequest(PIRP irp, ULONG_PTR infoPtr, NTSTATUS status);

-#endif /* __OVS_IOCTL_H_ */
+#endif /* __IOCTL_H_ */

 #endif /* OVS_USE_NL_INTERFACE */
diff --git a/datapath-windows/ovsext/OvsIpHelper.c b/datapath-windows/ovsext/IpHelper.c
similarity index 99%
rename from datapath-windows/ovsext/OvsIpHelper.c
rename to datapath-windows/ovsext/IpHelper.c
index cd2625a..fd663dc 100644
--- a/datapath-windows/ovsext/OvsIpHelper.c
+++ b/datapath-windows/ovsext/IpHelper.c
@@ -15,15 +15,15 @@
  */

 #include "precomp.h"
-#include "OvsIpHelper.h"
-#include "OvsSwitch.h"
-#include "OvsJhash.h"
+#include "IpHelper.h"
+#include "Switch.h"
+#include "Jhash.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_IPHELPER
-#include "OvsDebug.h"
+#include "Debug.h"

 /*
  * Fow now, we assume only one internal adapter
diff --git a/datapath-windows/ovsext/OvsIpHelper.h b/datapath-windows/ovsext/IpHelper.h
similarity index 97%
rename from datapath-windows/ovsext/OvsIpHelper.h
rename to datapath-windows/ovsext/IpHelper.h
index dc2602b..00f17f1 100644
--- a/datapath-windows/ovsext/OvsIpHelper.h
+++ b/datapath-windows/ovsext/IpHelper.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_IP_HELPER_H_
-#define __OVS_IP_HELPER_H_ 1
+#ifndef __IP_HELPER_H_
+#define __IP_HELPER_H_ 1

 #include <ntddk.h>
 #include <netioapi.h>
@@ -125,4 +125,4 @@ NTSTATUS OvsFwdIPHelperRequest(PNET_BUFFER_LIST nbl, UINT32 inPort,
 NTSTATUS OvsLookupIPFwdInfo(UINT32 dstIp, POVS_FWD_INFO info);
 VOID OvsCancelFwdIpHelperRequest(PNET_BUFFER_LIST nbl);

-#endif /* __OVS_IP_HELPER_H_ */
+#endif /* __IP_HELPER_H_ */
diff --git a/datapath-windows/ovsext/OvsJhash.c b/datapath-windows/ovsext/Jhash.c
similarity index 100%
rename from datapath-windows/ovsext/OvsJhash.c
rename to datapath-windows/ovsext/Jhash.c
diff --git a/datapath-windows/ovsext/OvsJhash.h b/datapath-windows/ovsext/Jhash.h
similarity index 93%
rename from datapath-windows/ovsext/OvsJhash.h
rename to datapath-windows/ovsext/Jhash.h
index a12be8e..eb3d4cd 100644
--- a/datapath-windows/ovsext/OvsJhash.h
+++ b/datapath-windows/ovsext/Jhash.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_JHASH_H_
-#define __OVS_JHASH_H_ 1
+#ifndef __JHASH_H_
+#define __JHASH_H_ 1

 /* This is the public domain lookup3 hash by Bob Jenkins from
  * http://burtleburtle.net/bob/c/lookup3.c, modified for style.
@@ -27,4 +27,4 @@
 uint32_t OvsJhashWords(const uint32_t *, size_t n_word, uint32_t basis);
 uint32_t OvsJhashBytes(const void *, size_t n_bytes, uint32_t basis);

-#endif /* __OVS_JHASH_H */
+#endif /* __JHASH_H_ */
diff --git a/datapath-windows/ovsext/OvsNetProto.h b/datapath-windows/ovsext/NetProto.h
similarity index 99%
rename from datapath-windows/ovsext/OvsNetProto.h
rename to datapath-windows/ovsext/NetProto.h
index a21ab5c..a364869 100644
--- a/datapath-windows/ovsext/OvsNetProto.h
+++ b/datapath-windows/ovsext/NetProto.h
@@ -14,11 +14,11 @@
  * limitations under the License.
  */

-#ifndef __OVS_NET_PROTO_H_
-#define __OVS_NET_PROTO_H_ 1
+#ifndef __NET_PROTO_H_
+#define __NET_PROTO_H_ 1

 #include "precomp.h"
-#include "OvsEth.h"
+#include "Ethernet.h"

 #define ETH_ADDR_LENGTH    6
 /*
@@ -366,4 +366,4 @@ typedef struct IPOpt {
 #define SOCKET_IPPROTO_UDP   17
 #define SOCKET_IPPROTO_GRE   47

-#endif /* __OVS_NET_PROTO_H_ */
+#endif /* __NET_PROTO_H_ */
diff --git a/datapath-windows/ovsext/Netlink.c b/datapath-windows/ovsext/Netlink.c
index 1c8d054..90a633b 100644
--- a/datapath-windows/ovsext/Netlink.c
+++ b/datapath-windows/ovsext/Netlink.c
@@ -22,7 +22,7 @@
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_NETLINK
-#include "OvsDebug.h"
+#include "Debug.h"

 /*
  * ---------------------------------------------------------------------------
diff --git a/datapath-windows/ovsext/Netlink.h b/datapath-windows/ovsext/Netlink.h
index bc89666..0edc2fa 100644
--- a/datapath-windows/ovsext/Netlink.h
+++ b/datapath-windows/ovsext/Netlink.h
@@ -17,7 +17,7 @@
 #ifndef __NETLINK_H_
 #define __NETLINK_H_ 1

-#include "OvsTypes.h"
+#include "Types.h"
 #include "NetlinkProto.h"

 /* Netlink attribute types. */
diff --git a/datapath-windows/ovsext/NetlinkProto.h b/datapath-windows/ovsext/NetlinkProto.h
index 20ab750..399b286 100644
--- a/datapath-windows/ovsext/NetlinkProto.h
+++ b/datapath-windows/ovsext/NetlinkProto.h
@@ -27,7 +27,7 @@
  * This header provides access to the Netlink message framing definitions
  * regardless of platform.
  */
-#include "OvsTypes.h"
+#include "Types.h"

 #define BUILD_ASSERT(EXPR) \
         typedef char AssertOnCompileFailed[(EXPR) ? 1: -1]
@@ -113,4 +113,4 @@ BUILD_ASSERT_DECL(sizeof(NL_ATTR) == 4);
 #define OVS_HDRLEN NLMSG_ALIGN(sizeof(OVS_HDR))
 #define NLA_HDRLEN ((INT) NLA_ALIGN(sizeof(NL_ATTR)))

-#endif /* NetlinProto.h */
+#endif /* __NETLINK_PROTO_H_ */
diff --git a/datapath-windows/ovsext/OvsOid.c b/datapath-windows/ovsext/Oid.c
similarity index 99%
rename from datapath-windows/ovsext/OvsOid.c
rename to datapath-windows/ovsext/Oid.c
index ad66be4..a675347 100644
--- a/datapath-windows/ovsext/OvsOid.c
+++ b/datapath-windows/ovsext/Oid.c
@@ -15,14 +15,14 @@
  */

 #include "precomp.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsNetProto.h"
-#include "OvsUser.h"
-#include "OvsFlow.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsOid.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "NetProto.h"
+#include "User.h"
+#include "Flow.h"
+#include "Event.h"
+#include "User.h"
+#include "Oid.h"

 /* Due to an imported header file */
 #pragma warning( disable:4505 )
@@ -31,7 +31,7 @@
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_DISPATCH
-#include "OvsDebug.h"
+#include "Debug.h"

 typedef struct _OVS_OID_CONTEXT {
     NDIS_EVENT oidComplete;
diff --git a/datapath-windows/ovsext/OvsOid.h b/datapath-windows/ovsext/Oid.h
similarity index 93%
rename from datapath-windows/ovsext/OvsOid.h
rename to datapath-windows/ovsext/Oid.h
index 40a5ec6..88a3d7d 100644
--- a/datapath-windows/ovsext/OvsOid.h
+++ b/datapath-windows/ovsext/Oid.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_OID_H_
-#define __OVS_OID_H_ 1
+#ifndef __OID_H_
+#define __OID_H_ 1

 NDIS_STATUS OvsQuerySwitchActivationComplete(POVS_SWITCH_CONTEXT switchContext,
                                              BOOLEAN *switchActive);
@@ -23,4 +23,4 @@ NDIS_STATUS OvsGetPortsOnSwitch(POVS_SWITCH_CONTEXT switchContext,
                                 PNDIS_SWITCH_PORT_ARRAY *portArrayOut);
 NDIS_STATUS OvsGetNicsOnSwitch(POVS_SWITCH_CONTEXT switchContext,
                                PNDIS_SWITCH_NIC_ARRAY *nicArrayOut);
-#endif /* __OVS_OID_H_ */
+#endif /* __OID_H_ */
diff --git a/datapath-windows/ovsext/OvsPacketIO.c b/datapath-windows/ovsext/PacketIO.c
similarity index 98%
rename from datapath-windows/ovsext/OvsPacketIO.c
rename to datapath-windows/ovsext/PacketIO.c
index 6017f30..ac7862d 100644
--- a/datapath-windows/ovsext/OvsPacketIO.c
+++ b/datapath-windows/ovsext/PacketIO.c
@@ -20,14 +20,14 @@
  */

 #include "precomp.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsNetProto.h"
-#include "OvsUser.h"
-#include "OvsPacketIO.h"
-#include "OvsFlow.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "NetProto.h"
+#include "User.h"
+#include "PacketIO.h"
+#include "Flow.h"
+#include "Event.h"
+#include "User.h"

 /* Due to an imported header file */
 #pragma warning( disable:4505 )
@@ -36,7 +36,7 @@
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_DISPATCH
-#include "OvsDebug.h"
+#include "Debug.h"

 extern NDIS_STRING ovsExtGuidUC;
 extern NDIS_STRING ovsExtFriendlyNameUC;
diff --git a/datapath-windows/ovsext/OvsPacketIO.h b/datapath-windows/ovsext/PacketIO.h
similarity index 96%
rename from datapath-windows/ovsext/OvsPacketIO.h
rename to datapath-windows/ovsext/PacketIO.h
index 11709dc..4d29a18 100644
--- a/datapath-windows/ovsext/OvsPacketIO.h
+++ b/datapath-windows/ovsext/PacketIO.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_PACKETIO_H_
-#define __OVS_PACKETIO_H_ 1
+#ifndef __PACKETIO_H_
+#define __PACKETIO_H_ 1

 typedef union _OVS_PACKET_HDR_INFO OVS_PACKET_HDR_INFO;

@@ -58,4 +58,4 @@ NDIS_STATUS OvsActionsExecute(POVS_SWITCH_CONTEXT switchContext,
 VOID OvsLookupFlowOutput(POVS_SWITCH_CONTEXT switchContext,
                          VOID *compList, PNET_BUFFER_LIST curNbl);

-#endif /* __OVS_PACKETIO_H_ */
+#endif /* __PACKETIO_H_ */
diff --git a/datapath-windows/ovsext/OvsPacketParser.c b/datapath-windows/ovsext/PacketParser.c
similarity index 99%
rename from datapath-windows/ovsext/OvsPacketParser.c
rename to datapath-windows/ovsext/PacketParser.c
index 0a93435..2c955e1 100644
--- a/datapath-windows/ovsext/OvsPacketParser.c
+++ b/datapath-windows/ovsext/PacketParser.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */

-#include "OvsPacketParser.h"
+#include "PacketParser.h"

 //XXX consider moving to NdisGetDataBuffer.
 const VOID *
diff --git a/datapath-windows/ovsext/OvsPacketParser.h b/datapath-windows/ovsext/PacketParser.h
similarity index 97%
rename from datapath-windows/ovsext/OvsPacketParser.h
rename to datapath-windows/ovsext/PacketParser.h
index ab3c613..55d110f 100644
--- a/datapath-windows/ovsext/OvsPacketParser.h
+++ b/datapath-windows/ovsext/PacketParser.h
@@ -14,11 +14,11 @@
  * limitations under the License.
  */

-#ifndef __OVS_PACKET_PARSER_H_
-#define __OVS_PACKET_PARSER_H_ 1
+#ifndef __PACKET_PARSER_H_
+#define __PACKET_PARSER_H_ 1

 #include "precomp.h"
-#include "OvsNetProto.h"
+#include "NetProto.h"

 const VOID* OvsGetPacketBytes(const NET_BUFFER_LIST *_pNB, UINT32 len,
                               UINT32 SrcOffset, VOID *storage);
@@ -141,4 +141,4 @@ OvsGetIcmp(const NET_BUFFER_LIST *packet,
     return OvsGetPacketBytes(packet, sizeof *storage, ofs, storage);
 }

-#endif /* __OVS_PACKET_PARSER_H_ */
+#endif /* __PACKET_PARSER_H_ */
diff --git a/datapath-windows/ovsext/OvsSwitch.c b/datapath-windows/ovsext/Switch.c
similarity index 98%
rename from datapath-windows/ovsext/OvsSwitch.c
rename to datapath-windows/ovsext/Switch.c
index f548599..9578680 100644
--- a/datapath-windows/ovsext/OvsSwitch.c
+++ b/datapath-windows/ovsext/Switch.c
@@ -21,19 +21,19 @@

 #include "precomp.h"

-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsFlow.h"
-#include "OvsIpHelper.h"
-#include "OvsTunnelIntf.h"
-#include "OvsOid.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "Flow.h"
+#include "IpHelper.h"
+#include "TunnelIntf.h"
+#include "Oid.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_SWITCH
-#include "OvsDebug.h"
+#include "Debug.h"

 POVS_SWITCH_CONTEXT gOvsSwitchContext;
 BOOLEAN gOvsInAttach;
diff --git a/datapath-windows/ovsext/OvsSwitch.h b/datapath-windows/ovsext/Switch.h
similarity index 97%
rename from datapath-windows/ovsext/OvsSwitch.h
rename to datapath-windows/ovsext/Switch.h
index d49fe9b..5199268 100644
--- a/datapath-windows/ovsext/OvsSwitch.h
+++ b/datapath-windows/ovsext/Switch.h
@@ -18,11 +18,11 @@
  * This file contains the definition of the switch object for the OVS.
  */

-#ifndef __OVS_SWITCH_H_
-#define __OVS_SWITCH_H_ 1
+#ifndef __SWITCH_H_
+#define __SWITCH_H_ 1

-#include "OvsNetProto.h"
-#include "OvsBufferMgmt.h"
+#include "NetProto.h"
+#include "BufferMgmt.h"
 #define OVS_MAX_VPORT_ARRAY_SIZE 1024

 #define OVS_VPORT_MASK (OVS_MAX_VPORT_ARRAY_SIZE - 1)
@@ -166,4 +166,4 @@ OvsReleaseDatapath(OVS_DATAPATH *datapath,
 PVOID OvsGetVportFromIndex(UINT16 index);
 PVOID OvsGetExternalVport();

-#endif /* __OVS_SWITCH_H_ */
+#endif /* __SWITCH_H_ */
diff --git a/datapath-windows/ovsext/OvsTunnel.c b/datapath-windows/ovsext/Tunnel.c
similarity index 98%
rename from datapath-windows/ovsext/OvsTunnel.c
rename to datapath-windows/ovsext/Tunnel.c
index d0288cc..2e7da10 100644
--- a/datapath-windows/ovsext/OvsTunnel.c
+++ b/datapath-windows/ovsext/Tunnel.c
@@ -30,15 +30,15 @@
 #pragma warning( disable:4127 )

 #include <fwpmk.h>
-#include "OvsTunnel.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsVxlan.h"
-#include "OvsPacketIO.h"
-#include "OvsNetProto.h"
-#include "OvsFlow.h"
+#include "Tunnel.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "User.h"
+#include "Vxlan.h"
+#include "PacketIO.h"
+#include "NetProto.h"
+#include "Flow.h"

 extern POVS_SWITCH_CONTEXT gOvsSwitchContext;

diff --git a/datapath-windows/ovsext/OvsTunnel.h b/datapath-windows/ovsext/Tunnel.h
similarity index 95%
rename from datapath-windows/ovsext/OvsTunnel.h
rename to datapath-windows/ovsext/Tunnel.h
index 110ff74..2978bb3 100644
--- a/datapath-windows/ovsext/OvsTunnel.h
+++ b/datapath-windows/ovsext/Tunnel.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_TUNNEL_H_
-#define __OVS_TUNNEL_H_ 1
+#ifndef __TUNNEL_H_
+#define __TUNNEL_H_ 1

 //
 // OVS_TUNNEL_PENDED_PACKET is the object type we used to store all information
@@ -54,4 +54,4 @@ NTSTATUS OvsTunnelNotify(FWPS_CALLOUT_NOTIFY_TYPE notifyType,
                          const GUID *filterKey,
                          const FWPS_FILTER *filter);

-#endif /* __OVS_TUNNEL_H_ */
+#endif /* __TUNNEL_H_ */
diff --git a/datapath-windows/ovsext/OvsTunnelFilter.c b/datapath-windows/ovsext/TunnelFilter.c
similarity index 98%
rename from datapath-windows/ovsext/OvsTunnelFilter.c
rename to datapath-windows/ovsext/TunnelFilter.c
index a1de007..b191dd1 100644
--- a/datapath-windows/ovsext/OvsTunnelFilter.c
+++ b/datapath-windows/ovsext/TunnelFilter.c
@@ -29,12 +29,12 @@
 #include <in6addr.h>
 #include <ip2string.h>

-#include "OvsTunnel.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsVxlan.h"
+#include "Tunnel.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "User.h"
+#include "Vxlan.h"


 #define INITGUID
diff --git a/datapath-windows/ovsext/OvsTunnelIntf.h b/datapath-windows/ovsext/TunnelIntf.h
similarity index 89%
rename from datapath-windows/ovsext/OvsTunnelIntf.h
rename to datapath-windows/ovsext/TunnelIntf.h
index 3543c8a..c622720 100644
--- a/datapath-windows/ovsext/OvsTunnelIntf.h
+++ b/datapath-windows/ovsext/TunnelIntf.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */

-#ifndef __OVS_TUNNEL_INTF_H_
-#define __OVS_TUNNEL_INTF_H_ 1
+#ifndef __TUNNEL_INTF_H_
+#define __TUNNEL_INTF_H_ 1

 /* Tunnel callout driver load/unload functions */
 NTSTATUS OvsTunnelFilterInitialize(PDRIVER_OBJECT driverObject);

 VOID OvsTunnelFilterUninitialize(PDRIVER_OBJECT driverObject);

-#endif /* __OVS_TUNNEL_INTF_H_ */
+#endif /* __TUNNEL_INTF_H_ */
diff --git a/datapath-windows/ovsext/OvsTypes.h b/datapath-windows/ovsext/Types.h
similarity index 94%
rename from datapath-windows/ovsext/OvsTypes.h
rename to datapath-windows/ovsext/Types.h
index 57b27e7..e48df7a 100644
--- a/datapath-windows/ovsext/OvsTypes.h
+++ b/datapath-windows/ovsext/Types.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_TYPES_H_
-#define __OVS_TYPES_H_ 1
+#ifndef __TYPES_H_
+#define __TYPES_H_ 1

 /* Defines the userspace specific data types
  * for files included from user space. */
@@ -38,4 +38,4 @@ typedef UINT64 BE64;

 #define SIZE_MAX MAXUINT32

-#endif /* __OVS_TYPES_H_ */
+#endif /* __TYPES_H_ */
diff --git a/datapath-windows/ovsext/OvsUser.c b/datapath-windows/ovsext/User.c
similarity index 99%
rename from datapath-windows/ovsext/OvsUser.c
rename to datapath-windows/ovsext/User.c
index 0880749..612a4bd 100644
--- a/datapath-windows/ovsext/OvsUser.c
+++ b/datapath-windows/ovsext/User.c
@@ -23,21 +23,21 @@
 #include "precomp.h"

 #include "Datapath.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsPacketIO.h"
-#include "OvsChecksum.h"
-#include "OvsNetProto.h"
-#include "OvsFlow.h"
-#include "OvsTunnelIntf.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "User.h"
+#include "PacketIO.h"
+#include "Checksum.h"
+#include "NetProto.h"
+#include "Flow.h"
+#include "TunnelIntf.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_USER
-#include "OvsDebug.h"
+#include "Debug.h"

 OVS_USER_PACKET_QUEUE ovsPacketQueues[OVS_MAX_NUM_PACKET_QUEUES];

diff --git a/datapath-windows/ovsext/OvsUser.h b/datapath-windows/ovsext/User.h
similarity index 98%
rename from datapath-windows/ovsext/OvsUser.h
rename to datapath-windows/ovsext/User.h
index b1e6e1e..ed41f14 100644
--- a/datapath-windows/ovsext/OvsUser.h
+++ b/datapath-windows/ovsext/User.h
@@ -18,8 +18,8 @@
  * forwarding packet to user space.
  */

-#ifndef __OVS_USER_H_
-#define __OVS_USER_H_ 1
+#ifndef __USER_H_
+#define __USER_H_ 1

 /*
  * Even we have more cores, I don't think we need
@@ -111,4 +111,4 @@ NTSTATUS OvsPurgeDpIoctl(PFILE_OBJECT fileObject);

 NTSTATUS OvsWaitDpIoctl(PIRP irp, PFILE_OBJECT fileObject);

-#endif /* __OVS_USER_H_ */
+#endif /* __USER_H_ */
diff --git a/datapath-windows/ovsext/OvsUtil.c b/datapath-windows/ovsext/Util.c
similarity index 99%
rename from datapath-windows/ovsext/OvsUtil.c
rename to datapath-windows/ovsext/Util.c
index e70f9a1..51360a8 100644
--- a/datapath-windows/ovsext/OvsUtil.c
+++ b/datapath-windows/ovsext/Util.c
@@ -20,7 +20,7 @@
 #endif
 #define OVS_DBG_MOD OVS_DBG_OTHERS

-#include "OvsDebug.h"
+#include "Debug.h"

 extern NDIS_HANDLE gOvsExtDriverHandle;

diff --git a/datapath-windows/ovsext/OvsUtil.h b/datapath-windows/ovsext/Util.h
similarity index 97%
rename from datapath-windows/ovsext/OvsUtil.h
rename to datapath-windows/ovsext/Util.h
index bff06b8..c45d488 100644
--- a/datapath-windows/ovsext/OvsUtil.h
+++ b/datapath-windows/ovsext/Util.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */

-#ifndef __OVS_UTIL_H_
-#define __OVS_UTIL_H_ 1
+#ifndef __UTIL_H_
+#define __UTIL_H_ 1

 #define OVS_MEMORY_TAG                  'TSVO'
 #define OVS_FIX_SIZE_NBL_POOL_TAG       'FSVO'
@@ -75,4 +75,4 @@ VOID OvsAppendList(PLIST_ENTRY dst, PLIST_ENTRY src);
 #define BIT16(_x)                       ((UINT16)0x1 << (_x))
 #define BIT32(_x)                       ((UINT32)0x1 << (_x))

-#endif /* __OVS_UTIL_H_ */
+#endif /* __UTIL_H_ */
diff --git a/datapath-windows/ovsext/OvsVport.c b/datapath-windows/ovsext/Vport.c
similarity index 99%
rename from datapath-windows/ovsext/OvsVport.c
rename to datapath-windows/ovsext/Vport.c
index 0c00e52..0d1e4ab 100644
--- a/datapath-windows/ovsext/OvsVport.c
+++ b/datapath-windows/ovsext/Vport.c
@@ -15,20 +15,20 @@
  */

 #include "precomp.h"
-#include "OvsJhash.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsEvent.h"
-#include "OvsUser.h"
-#include "OvsVxlan.h"
-#include "OvsIpHelper.h"
-#include "OvsOid.h"
+#include "Jhash.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Event.h"
+#include "User.h"
+#include "Vxlan.h"
+#include "IpHelper.h"
+#include "Oid.h"

 #ifdef OVS_DBG_MOD
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_VPORT
-#include "OvsDebug.h"
+#include "Debug.h"

 #define VPORT_NIC_ENTER(_nic) \
     OVS_LOG_TRACE("Enter: PortId: %x, NicIndex: %d", _nic->PortId, \
diff --git a/datapath-windows/ovsext/OvsVport.h b/datapath-windows/ovsext/Vport.h
similarity index 98%
rename from datapath-windows/ovsext/OvsVport.h
rename to datapath-windows/ovsext/Vport.h
index 4ab0019..80bdea8 100644
--- a/datapath-windows/ovsext/OvsVport.h
+++ b/datapath-windows/ovsext/Vport.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */

-#ifndef __OVS_VPORT_H_
-#define __OVS_VPORT_H_ 1
+#ifndef __VPORT_H_
+#define __VPORT_H_ 1

-#include "OvsSwitch.h"
+#include "Switch.h"

 /*
  * A Vport, or Virtual Port, is a port on the OVS. It can be one of the
@@ -194,4 +194,4 @@ OvsGetExternalMtu()
     return ((POVS_VPORT_ENTRY) OvsGetExternalVport())->mtu;
 }

-#endif /* __OVS_VPORT_H_ */
+#endif /* __VPORT_H_ */
diff --git a/datapath-windows/ovsext/OvsVxlan.c b/datapath-windows/ovsext/Vxlan.c
similarity index 98%
rename from datapath-windows/ovsext/OvsVxlan.c
rename to datapath-windows/ovsext/Vxlan.c
index db1909e..3a1291c 100644
--- a/datapath-windows/ovsext/OvsVxlan.c
+++ b/datapath-windows/ovsext/Vxlan.c
@@ -15,18 +15,18 @@
  */

 #include "precomp.h"
-#include "OvsNetProto.h"
-#include "OvsSwitch.h"
-#include "OvsVport.h"
-#include "OvsFlow.h"
-#include "OvsVxlan.h"
-#include "OvsIpHelper.h"
-#include "OvsChecksum.h"
-#include "OvsUser.h"
-#include "OvsPacketIO.h"
-#include "OvsFlow.h"
-#include "OvsPacketParser.h"
-#include "OvsChecksum.h"
+#include "NetProto.h"
+#include "Switch.h"
+#include "Vport.h"
+#include "Flow.h"
+#include "Vxlan.h"
+#include "IpHelper.h"
+#include "Checksum.h"
+#include "User.h"
+#include "PacketIO.h"
+#include "Flow.h"
+#include "PacketParser.h"
+#include "Checksum.h"

 #pragma warning( push )
 #pragma warning( disable:4127 )
@@ -36,7 +36,7 @@
 #undef OVS_DBG_MOD
 #endif
 #define OVS_DBG_MOD OVS_DBG_VXLAN
-#include "OvsDebug.h"
+#include "Debug.h"

 /* Helper macro to check if a VXLAN ID is valid. */
 #define VXLAN_ID_IS_VALID(vxlanID) (0 < (vxlanID) && (vxlanID) <= 0xffffff)
diff --git a/datapath-windows/ovsext/OvsVxlan.h b/datapath-windows/ovsext/Vxlan.h
similarity index 95%
rename from datapath-windows/ovsext/OvsVxlan.h
rename to datapath-windows/ovsext/Vxlan.h
index 55cfc82..e777933 100644
--- a/datapath-windows/ovsext/OvsVxlan.h
+++ b/datapath-windows/ovsext/Vxlan.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */

-#ifndef __OVS_VXLAN_H_
-#define __OVS_VXLAN_H_ 1
+#ifndef __VXLAN_H_
+#define __VXLAN_H_ 1

-#include "OvsNetProto.h"
+#include "NetProto.h"
 typedef struct _OVS_VXLAN_VPORT {
     UINT32 dstPort;
     UINT64 inPkts;
@@ -78,4 +78,4 @@ OvsGetVxlanTunHdrSize(VOID)
 #define VXLAN_UDP_PORT 4789
 #define VXLAN_UDP_PORT_NBO 0xB512

-#endif /* __OVS_VXLAN_H_ */
+#endif /* __VXLAN_H_ */
diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj
index 1a618de..82ab908 100644
--- a/datapath-windows/ovsext/ovsext.vcxproj
+++ b/datapath-windows/ovsext/ovsext.vcxproj
@@ -71,31 +71,32 @@
   </ImportGroup>
   <ItemGroup Label="WrappedTaskItems">
     <ClInclude Include="..\include\OvsDpInterfaceExt.h" />
-    <ClInclude Include="OvsAtomic.h" />
-    <ClInclude Include="OvsBufferMgmt.h" />
-    <ClInclude Include="OvsChecksum.h" />
+    <ClInclude Include="Atomic.h" />
+    <ClInclude Include="BufferMgmt.h" />
+    <ClInclude Include="Checksum.h" />
     <ClInclude Include="Datapath.h" />
+    <ClInclude Include="Debug.h" />
+    <ClInclude Include="Ethernet.h" />
+    <ClInclude Include="Event.h" />
+    <ClInclude Include="Flow.h" />
+    <ClInclude Include="Ioctl.h" />
+    <ClInclude Include="IpHelper.h" />
+    <ClInclude Include="Jhash.h" />
     <ClInclude Include="Netlink.h" />
     <ClInclude Include="NetlinkProto.h" />
-    <ClInclude Include="OvsDebug.h" />
-    <ClInclude Include="OvsEth.h" />
-    <ClInclude Include="OvsEvent.h" />
-    <ClInclude Include="OvsFlow.h" />
-    <ClInclude Include="OvsIoctl.h" />
-    <ClInclude Include="OvsIpHelper.h" />
-    <ClInclude Include="OvsJhash.h" />
-    <ClInclude Include="OvsNetProto.h" />
-    <ClInclude Include="OvsOid.h" />
-    <ClInclude Include="OvsPacketParser.h" />
-    <ClInclude Include="OvsSwitch.h" />
-    <ClInclude Include="OvsTunnel.h" />
-    <ClInclude Include="OvsTunnelIntf.h" />
-    <ClInclude Include="OvsTypes.h" />
-    <ClInclude Include="OvsUser.h" />
-    <ClInclude Include="OvsUtil.h" />
-    <ClInclude Include="OvsVport.h" />
-    <ClInclude Include="OvsVxlan.h" />
+    <ClInclude Include="NetProto.h" />
+    <ClInclude Include="Oid.h" />
+    <ClInclude Include="PacketIO.h" />
+    <ClInclude Include="PacketParser.h" />
     <ClInclude Include="precomp.h" />
+    <ClInclude Include="Switch.h" />
+    <ClInclude Include="Tunnel.h" />
+    <ClInclude Include="TunnelIntf.h" />
+    <ClInclude Include="Types.h" />
+    <ClInclude Include="User.h" />
+    <ClInclude Include="Util.h" />
+    <ClInclude Include="Vport.h" />
+    <ClInclude Include="Vxlan.h" />
   </ItemGroup>
   <PropertyGroup>
     <TargetName>OVSExt</TargetName>
@@ -127,34 +128,34 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Actions.c" />
+    <ClCompile Include="BufferMgmt.c" />
+    <ClCompile Include="Checksum.c" />
+    <ClCompile Include="Debug.c" />
+    <ClCompile Include="Driver.c" />
+    <ClCompile Include="Event.c" />
+    <ClCompile Include="Flow.c" />
+    <ClCompile Include="Ioctl.c" />
+    <ClCompile Include="IpHelper.c" />
+    <ClCompile Include="Jhash.c" />
     <ClCompile Include="Netlink.c" />
     <ClCompile Include="Datapath.c" />
-    <ClCompile Include="OvsDriver.c" />
-    <ClCompile Include="OvsJhash.c" />
-    <ClCompile Include="OvsOid.c" />
-    <ClCompile Include="OvsPacketIO.c" />
-    <ClCompile Include="OvsPacketParser.c" />
-    <ClCompile Include="OvsBufferMgmt.c" />
-    <ClCompile Include="OvsChecksum.c" />
-    <ClCompile Include="OvsIpHelper.c" />
-    <ClCompile Include="OvsTunnel.c" />
-    <ClCompile Include="OvsTunnelFilter.c" />
-    <ClCompile Include="OvsVxlan.c" />
-    <ClCompile Include="OvsActions.c" />
-    <ClCompile Include="OvsDebug.c" />
-    <ClCompile Include="OvsEvent.c" />
-    <ClCompile Include="OvsFlow.c" />
-    <ClCompile Include="OvsUser.c" />
-    <ClCompile Include="OvsIoctl.c" />
-    <ClCompile Include="OvsSwitch.c" />
-    <ClCompile Include="OvsUtil.c" />
-    <ClCompile Include="OvsVport.c" />
+    <ClCompile Include="Oid.c" />
+    <ClCompile Include="PacketIO.c" />
+    <ClCompile Include="PacketParser.c" />
     <ClCompile Include="precompsrc.c">
       <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
       <PreCompiledHeader>Create</PreCompiledHeader>
       <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
     </ClCompile>
+    <ClCompile Include="Switch.c" />
+    <ClCompile Include="Tunnel.c" />
+    <ClCompile Include="TunnelFilter.c" />
+    <ClCompile Include="User.c" />
+    <ClCompile Include="Util.c" />
+    <ClCompile Include="Vport.c" />
+    <ClCompile Include="Vxlan.c" />
     <ResourceCompile Include="ovsext.rc" />
   </ItemGroup>
   <ItemGroup>
@@ -167,4 +168,4 @@
     <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/datapath-windows/ovsext/precomp.h b/datapath-windows/ovsext/precomp.h
index 5b6c2a9..41e3218 100644
--- a/datapath-windows/ovsext/precomp.h
+++ b/datapath-windows/ovsext/precomp.h
@@ -21,9 +21,9 @@
 #include <ntstrsafe.h>
 #include <Strsafe.h>

-#include "OvsTypes.h"
+#include "Types.h"
 #include "..\include\OvsPub.h"
-#include "OvsUtil.h"
+#include "Util.h"
 #include "Netlink.h"
 #include "NetlinkProto.h"
 /*
--
1.9.0.msysgit.0



More information about the dev mailing list