Merge topic 'minor-cleanups'

27591a54 Define WIN32_LEAN_AND_MEAN for CMake sources on Windows
481c9003 libarchive: Fix include order in xxhash.c

Source/CMakeLists.txt

@@ -45,9 +45,12 @@ endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
 
-# ensure Unicode friendly APIs are used on Windows
 if(WIN32)
+  # ensure Unicode friendly APIs are used on Windows
   add_definitions(-DUNICODE -D_UNICODE)
+
+  # minimize windows.h content
+  add_definitions(-DWIN32_LEAN_AND_MEAN)
 endif()
 
 # configure the .dox.in file

Utilities/cmlibarchive/libarchive/xxhash.c

@@ -29,12 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 You can contact the author at :
 - xxHash source repository : http://code.google.com/p/xxhash/
 */
-#include <stdlib.h>
-#include <string.h>
 
 #include "archive_platform.h"
 #include "archive_xxhash.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 #ifdef HAVE_LIBLZ4
 
 /***************************************