From 63ac2d0f1f2456e53615e72d39ed8d4e357ef991 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 17 Jun 2005 08:02:05 +0000
Subject: [PATCH] Cleanup the usage of W32API.

svn path=/trunk/; revision=15951
---
 reactos/lib/kernel32/k32.h                |  3 ---
 reactos/lib/kernel32/kernel32.xml         |  4 ++++
 reactos/lib/kernel32/misc/lzexpand_main.c | 13 ++-----------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h
index 0ea00323135..5d1638810fe 100755
--- a/reactos/lib/kernel32/k32.h
+++ b/reactos/lib/kernel32/k32.h
@@ -1,7 +1,4 @@
-#define _WIN32_WINNT 0x0502
-#define __USE_W32API
 #define NTOS_MODE_USER
-#define __NO_CTYPE_INLINES
 #include <ntos.h>
 #include <ctype.h>
 #include <stdarg.h>
diff --git a/reactos/lib/kernel32/kernel32.xml b/reactos/lib/kernel32/kernel32.xml
index c715c21d050..8ced0a12392 100644
--- a/reactos/lib/kernel32/kernel32.xml
+++ b/reactos/lib/kernel32/kernel32.xml
@@ -3,6 +3,9 @@
 	<include base="kernel32_base">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_SEH_NO_NATIVE_NLG" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_WINNT">0x0502</define>
+	<define name="__NO_CTYPE_INLINES" />
 	<define name="WINVER">0x0500</define>
 	<pch>k32.h</pch>
 	<directory name="debug">
@@ -109,6 +112,7 @@
 	<include base="kernel32">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_SEH_NO_NATIVE_NLG" />
+	<define name="__USE_W32API" />
 	<define name="WINVER">0x0500</define>
 	<library>kernel32_base</library>
 	<library>pseh</library>
diff --git a/reactos/lib/kernel32/misc/lzexpand_main.c b/reactos/lib/kernel32/misc/lzexpand_main.c
index 73d7da38a39..8a05d4f240b 100644
--- a/reactos/lib/kernel32/misc/lzexpand_main.c
+++ b/reactos/lib/kernel32/misc/lzexpand_main.c
@@ -24,20 +24,11 @@
 
 //#include "config.h"
 
+#include <k32.h>
 #define NDEBUG
 #include "../include/debug.h"
-#include <string.h>
-#define __NO_CTYPE_INLINES
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdarg.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "windows.h"
 #include "lzexpand.h"
+
 #define HFILE_ERROR ((HFILE)-1)
 
 /* The readahead length of the decompressor. Reading single bytes