Install ipexport.h and icmpapi.h with the other Windows includes.

dlls/icmp/icmp_main.c

@@ -68,8 +68,8 @@
 #endif
 
 #include "winerror.h"
-#include "wine/ipexport.h"
-#include "wine/icmpapi.h"
+#include "ipexport.h"
+#include "icmpapi.h"
 #include "wine/debug.h"
 
 /* Set up endiannes macros for the ip and ip_icmp BSD headers */

include/Makefile.in

@@ -40,10 +40,12 @@ WINDOWS_INCLUDES = \
 	fci.h \
 	fdi.h \
 	guiddef.h \
+	icmpapi.h \
 	imagehlp.h \
 	imm.h \
 	initguid.h \
 	instance.h \
+	ipexport.h \
 	lm.h \
 	lmaccess.h \
 	lmapibuf.h \
@@ -184,8 +186,6 @@ MSVCRT_INCLUDES = \
 WINE_INCLUDES = \
 	debug.h \
 	exception.h \
-	icmpapi.h \
-	ipexport.h \
 	library.h \
 	obj_base.h \
 	obj_cache.h \

include/icmpapi.h

@@ -1,11 +1,6 @@
 /*
  * Interface to the ICMP functions.
  *
- * This header is not part of the standard headers, it is usually
- * delivered separately and this is why it is not directly in 'include'.
- *
- * Depends on ipexport.h (there is no include directive in the original)
- *
  * Copyright (C) 1999 Francois Gouget
  *
  * This library is free software; you can redistribute it and/or
@@ -26,7 +21,6 @@
 #ifndef __WINE_ICMPAPI_H
 #define __WINE_ICMPAPI_H
 
-#include "wine/ipexport.h"
 #include "windef.h"
 
 HANDLE WINAPI IcmpCreateFile(

include/ipexport.h

@@ -1,9 +1,6 @@
 /*
  * Defines the types and macros used by the ICMP API, see icmpapi.h.
  *
- * This header is not part of the standard headers, it is usually
- * delivered separately and this is why it is not directly in 'include'.
- *
  * Copyright (C) 1999 Francois Gouget
  *
  * This library is free software; you can redistribute it and/or