Mad the include files idempotent using a consistent macro naming

include/aspi.h

 /* ASPI definitions used for both WNASPI16 and WNASPI32 */
 
-#if !defined(ASPI_H)
-#define ASPI_H
+#ifndef __WINE_ASPI_H
+#define __WINE_ASPI_H
+
+#include "windef.h"
 
 #include "pshpack1.h"
 

include/casemap.h

@@ -5,6 +5,11 @@
  * Mapping tables for Unicode case conversion
  */
 
+#ifndef __WINE_CASEMAP_H
+#define __WINE_CASEMAP_H
+
+#include "windef.h"
+
 /* Lowercase mappings 0000 - 00FF */
 static const WCHAR lblk00[256] = {
 	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
@@ -903,3 +908,4 @@ static const WCHAR * const uprtable[256] = {
 	000000, 000000, 000000, 000000, 000000, 000000, 000000, ublkFF,
 };
 
+#endif /* __WINE_CASEMAP_H */

include/console.h

@@ -5,8 +5,8 @@
    interface. 
 */
 
-#ifndef CONSOLE_H
-#define CONSOLE_H
+#ifndef __WINE_CONSOLE_H
+#define __WINE_CONSOLE_H
 
 #include <stdio.h>
 #include "config.h"

include/ddeml.h

@@ -5,8 +5,8 @@
  * Copyright 1997 Len White
  */
 
-#ifndef __WINE__DDEML_H
-#define __WINE__DDEML_H
+#ifndef __WINE_DDEML_H
+#define __WINE_DDEML_H
 
 #include "windef.h"
 
@@ -198,7 +198,6 @@ typedef DWORD HCONVLIST;
 typedef DWORD HCONV;
 typedef DWORD HSZ;
 typedef DWORD HDDEDATA;
-typedef CHAR *LPTSTR;
 
 
 
@@ -342,4 +341,4 @@ UINT      WINAPI DdeQueryConvInfo(HCONV,DWORD,LPCONVINFO);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif  /* __WINE__DDEML_H */
+#endif  /* __WINE_DDEML_H */

include/digitalv.h

 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
 
+#ifndef __WINE_DIGITALV_H
+#define __WINE_DIGITALV_H
+
 /*
  * Wine Digital Video extensions
  */
 
+#include "mmsystem.h"
+#include "windef.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1000,3 +1006,4 @@ typedef struct {
 }
 #endif
 
+#endif /* __WINE_DIGITALV_H */

include/dinput.h

-#ifndef _WINE_DINPUT_H
-#define _WINE_DINPUT_H
+#ifndef __WINE_DINPUT_H
+#define __WINE_DINPUT_H
 
 #include "windef.h" /* for MAX_PATH */
 #include "unknwn.h"

include/initguid.h

@@ -6,8 +6,8 @@
  * shlguid.h
  */
 
-#ifndef __INIT_GUID_H
-#define __INIT_GUID_H
+#ifndef __WINE_INITGUID_H
+#define __WINE_INITGUID_H
 
 #include "wtypes.h"
 
@@ -22,4 +22,4 @@
 
 DEFINE_GUID(GUID_NULL,   0,0,0,0,0,0,0,0,0,0,0);
 
-#endif 
+#endif /* __WINE_INITGUID_H */

include/mmreg.h

@@ -2,6 +2,8 @@
  *      mmreg.h   -       Declarations for ???
  */
 
+#ifndef __WINE_MMREG_H
+#define __WINE_MMREG_H
 
 /***********************************************************************
  * Defines/Enums
@@ -99,3 +101,4 @@ typedef struct _WAVEFORMATEX {
 
 #define WAVE_FORMAT_DEVELOPMENT         	(0xFFFF)
 
+#endif /* __WINE_MMREG_H */

include/ntdll.h

@@ -15,83 +15,6 @@ extern "C" {
 
 typedef DWORD NTSTATUS;
 
-#define	SID_REVISION			(1)	/* Current revision */
-#define	SID_MAX_SUB_AUTHORITIES		(15)	/* current max subauths */
-#define	SID_RECOMMENDED_SUB_AUTHORITIES	(1)	/* recommended subauths */
-
-/* ACLs of NT */
-
-#define	ACL_REVISION	2
-
-#define	ACL_REVISION1	1
-#define	ACL_REVISION2	2
-
-/* ACEs, directly starting after an ACL */
-typedef struct _ACE_HEADER {
-	BYTE	AceType;
-	BYTE	AceFlags;
-	WORD	AceSize;
-} ACE_HEADER,*LPACE_HEADER;
-
-/* AceType */
-#define	ACCESS_ALLOWED_ACE_TYPE		0
-#define	ACCESS_DENIED_ACE_TYPE		1
-#define	SYSTEM_AUDIT_ACE_TYPE		2
-#define	SYSTEM_ALARM_ACE_TYPE		3
-
-/* inherit AceFlags */
-#define	OBJECT_INHERIT_ACE		0x01
-#define	CONTAINER_INHERIT_ACE		0x02
-#define	NO_PROPAGATE_INHERIT_ACE	0x04
-#define	INHERIT_ONLY_ACE		0x08
-#define	VALID_INHERIT_FLAGS		0x0F
-
-/* AceFlags mask for what events we (should) audit */
-#define	SUCCESSFUL_ACCESS_ACE_FLAG	0x40
-#define	FAILED_ACCESS_ACE_FLAG		0x80
-
-/* different ACEs depending on AceType 
- * SidStart marks the begin of a SID
- * so the thing finally looks like this:
- * 0: ACE_HEADER
- * 4: ACCESS_MASK
- * 8... : SID
- */
-typedef struct _ACCESS_ALLOWED_ACE {
-	ACE_HEADER	Header;
-	DWORD		Mask;
-	DWORD		SidStart;
-} ACCESS_ALLOWED_ACE,*LPACCESS_ALLOWED_ACE;
-
-typedef struct _ACCESS_DENIED_ACE {
-	ACE_HEADER	Header;
-	DWORD		Mask;
-	DWORD		SidStart;
-} ACCESS_DENIED_ACE,*LPACCESS_DENIED_ACE;
-
-typedef struct _SYSTEM_AUDIT_ACE {
-	ACE_HEADER	Header;
-	DWORD		Mask;
-	DWORD		SidStart;
-} SYSTEM_AUDIT_ACE,*LPSYSTEM_AUDIT_ACE;
-
-typedef struct _SYSTEM_ALARM_ACE {
-	ACE_HEADER	Header;
-	DWORD		Mask;
-	DWORD		SidStart;
-} SYSTEM_ALARM_ACE,*LPSYSTEM_ALARM_ACE;
-
-typedef enum tagSID_NAME_USE {
-	SidTypeUser = 1,
-	SidTypeGroup,
-	SidTypeDomain,
-	SidTypeAlias,
-	SidTypeWellKnownGroup,
-	SidTypeDeletedAccount,
-	SidTypeInvalid,
-	SidTypeUnknown
-} SID_NAME_USE,*PSID_NAME_USE;
-
 typedef struct _RTL_RWLOCK {
 	CRITICAL_SECTION	rtlCS;
 	HANDLE		hSharedReleaseSemaphore;

include/oleobj.h

-#ifndef _WINE_OLEOBJ_H
-#define _WINE_OLEOBJ_H
+#ifndef __WINE_OLEOBJ_H
+#define __WINE_OLEOBJ_H
 
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
@@ -7,5 +7,5 @@
 #include "wine/obj_dataobject.h"
 #include "wine/obj_oleobj.h"
 
-#endif /*_WINE_OLEOBJ_H*/
+#endif /* __WINE_OLEOBJ_H */
 

include/prsht.h

-#ifndef _WINE_PRSHT_H
-#define _WINE_PRSHT_H
+#ifndef __WINE_PRSHT_H
+#define __WINE_PRSHT_H
 
 #include "winuser.h"
 
@@ -382,6 +382,4 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK)
 }
 #endif
 
-
-
-#endif /* _WINE_PRSHT_H */
+#endif /* __WINE_PRSHT_H */

include/resource.h

@@ -8,10 +8,7 @@
 #define __WINE_RESOURCE_H
 
 #include "windef.h"
-
-#ifndef __WRC_RSC_H
 #include "wrc_rsc.h"
-#endif
 
 /*
  * BS: I comment this out to catch all occurences

include/shellapi.h

-#ifndef _WINE_SHELLAPI_H
-#define _WINE_SHELLAPI_H
+#ifndef __WINE_SHELLAPI_H
+#define __WINE_SHELLAPI_H
 
 #include "windef.h"
 
@@ -274,4 +274,4 @@ BOOL      WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
 
 #include "poppack.h"
 
-#endif /* _WINE_SHELLAPI_H */
+#endif /* __WINE_SHELLAPI_H */

include/struct32.h

 /* Structure definitions for Win32 -- used only internally */
-#ifndef __WINE__STRUCT32_H
-#define __WINE__STRUCT32_H
+#ifndef __WINE_STRUCT32_H
+#define __WINE_STRUCT32_H
 
 #include "winbase.h"
 #include "wine/winuser16.h"

include/ts_xf86dga.h

@@ -6,8 +6,8 @@
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TSXF86DGA_H
-#define __WINE_TSXF86DGA_H
+#ifndef __WINE_TS_XF86DGA_H
+#define __WINE_TS_XF86DGA_H
 
 #include "config.h"
 
@@ -32,4 +32,4 @@ extern Status TSXF86DGAViewPortChanged(Display*,int,int);
 
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TSXF86DGA_H */
+#endif /* __WINE_TS_XF86DGA_H */

include/ts_xf86vmode.h

@@ -6,8 +6,8 @@
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TSXF86VMODE_H
-#define __WINE_TSXF86VMODE_H
+#ifndef __WINE_TS_XF86VMODE_H
+#define __WINE_TS_XF86VMODE_H
 
 #include "config.h"
 
@@ -40,4 +40,4 @@ extern Bool TSXF86VidModeSetViewPort(Display*,int,int,int);
 
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TSXF86VMODE_H */
+#endif /* __WINE_TS_XF86VMODE_H */

include/ts_xlib.h

@@ -6,8 +6,8 @@
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TSXLIB_H
-#define __WINE_TSXLIB_H
+#ifndef __WINE_TS_XLIB_H
+#define __WINE_TS_XLIB_H
 
 #include "config.h"
 
@@ -138,4 +138,4 @@ extern void TS_XInitImageFuncPtrs(XImage *);
 
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TSXLIB_H */
+#endif /* __WINE_TS_XLIB_H */

include/ts_xpm.h

@@ -6,8 +6,8 @@
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TSXPM_H
-#define __WINE_TSXPM_H
+#ifndef __WINE_TS_XPM_H
+#define __WINE_TS_XPM_H
 
 #include "config.h"
 
@@ -24,4 +24,4 @@ extern int TSXpmAttributesSize(void);
 
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TSXPM_H */
+#endif /* __WINE_TS_XPM_H */

include/ts_xresource.h

@@ -6,8 +6,8 @@
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TSXRESOURCE_H
-#define __WINE_TSXRESOURCE_H
+#ifndef __WINE_TS_XRESOURCE_H
+#define __WINE_TS_XRESOURCE_H
 
 #include "config.h"
 
@@ -27,4 +27,4 @@ extern void  TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const  char
 
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TSXRESOURCE_H */
+#endif /* __WINE_TS_XRESOURCE_H */

include/ts_xshm.h

@@ -6,8 +6,8 @@
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TSXSHM_H
-#define __WINE_TSXSHM_H
+#ifndef __WINE_TS_XSHM_H
+#define __WINE_TS_XSHM_H
 
 #include "config.h"
 
@@ -32,4 +32,4 @@ extern Pixmap TSXShmCreatePixmap(Display *, Drawable, char *, XShmSegmentInfo *,
 
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TSXSHM_H */
+#endif /* __WINE_TS_XSHM_H */

include/ts_xutil.h

@@ -6,8 +6,8 @@
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TSXUTIL_H
-#define __WINE_TSXUTIL_H
+#ifndef __WINE_TS_XUTIL_H
+#define __WINE_TS_XUTIL_H
 
 #include "config.h"
 
@@ -56,4 +56,4 @@ extern XContext TSXUniqueContext(void);
 
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TSXUTIL_H */
+#endif /* __WINE_TS_XUTIL_H */

include/tweak.h

@@ -6,7 +6,7 @@
  *
  *****************************************************************************/
 
-#if !defined(__WINE_TWEAK_H)
+#ifndef __WINE_TWEAK_H
 #define __WINE_TWEAK_H
 
 #include "windef.h"

include/w32sys.h

@@ -4,8 +4,10 @@
  * Copyright (c) 1996 Anand Kumria
  */
 
-#ifndef __WINE__W32SYS_H
-#define __WINE__W32SYS_H
+#ifndef __WINE_W32SYS_H
+#define __WINE_W32SYS_H
+
+#include "windef.h"
 
 typedef struct _WIN32SINFO {
     BYTE   bMajor;

include/winaspi.h

-#if !defined(WINASPI_H)
-#define WINASPI_H
+#ifndef __WINE_WINASPI_H
+#define __WINE_WINASPI_H
+
+#include "windef.h"
 
 #include "pshpack1.h"
 
@@ -99,4 +101,4 @@ typedef union SRB16 SRB16;
 
 #include "poppack.h"
 
-#endif
+#endif /* __WINE_WINASPI_H */

include/windef.h

@@ -318,29 +318,6 @@ typedef LRESULT (CALLBACK *WNDENUMPROC)(HWND,LPARAM);
 typedef LRESULT (CALLBACK *WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
 typedef LRESULT (CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM);
 
-/* TCHAR data types definitions for Winelib. */
-/* These types are _not_ defined for the emulator, because they */
-/* depend on the UNICODE macro that only exists in user's code. */
-
-#ifndef __WINE__
-# ifdef UNICODE
-typedef WCHAR TCHAR;
-typedef LPWSTR LPTSTR;
-typedef LPCWSTR LPCTSTR;
-#define __TEXT(string) L##string /*probably wrong */
-# else  /* UNICODE */
-typedef CHAR TCHAR;
-typedef LPSTR LPTSTR;
-typedef LPCSTR LPCTSTR;
-#define __TEXT(string) string
-# endif /* UNICODE */
-#endif   /* __WINE__ */
-#define TEXT(quote) __TEXT(quote)
-
-/* Data types specific to the library. These do _not_ exist in the emulator. */
-
-
-
 /* Define some empty macros for compatibility with Windows code. */
 
 #ifndef __WINE__

include/wine/keyboard16.h

-#ifndef _KEYBOARD16_H
-#define _KEYBOARD16_H
+#ifndef __WINE_WINE_KEYBOARD16_H
+#define __WINE_WINE_KEYBOARD16_H
 
 #include "windef.h"
 
@@ -11,4 +11,4 @@ INT16       WINAPI OemToAnsi16(LPCSTR,LPSTR);
 VOID        WINAPI OemToAnsiBuff16(LPCSTR,LPSTR,UINT16);
 
 
-#endif /* _KEYBOARD16_H */
+#endif /* __WINE_WINE_KEYBOARD16_H */

include/wine/obj_commdlgbrowser.h

@@ -2,8 +2,8 @@
  *    ICommDlgBrowser
  */
 
-#ifndef __WINE_WINE_OBJ_ICOMMDLGBROWSER_H
-#define __WINE_WINE_OBJ_ICOMMDLGBROWSER_H
+#ifndef __WINE_WINE_OBJ_COMMDLGBROWSER_H
+#define __WINE_WINE_OBJ_COMMDLGBROWSER_H
 
 #include "winbase.h"
 #include "winuser.h"
@@ -48,4 +48,4 @@ ICOM_DEFINE(ICommDlgBrowser,IUnknown)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_WINE_OBJ_ICOMMDLGBROWSER_H */
+#endif /* __WINE_WINE_OBJ_COMMDLGBROWSER_H */

include/wine/obj_contextmenu.h

@@ -2,8 +2,8 @@
  *    IContextMenu
  */
 
-#ifndef __WINE_WINE_OBJ_ICONTEXTMENU_H
-#define __WINE_WINE_OBJ_ICONTEXTMENU_H
+#ifndef __WINE_WINE_OBJ_CONTEXTMENU_H
+#define __WINE_WINE_OBJ_CONTEXTMENU_H
 
 #include "winbase.h"
 #include "winuser.h"
@@ -132,4 +132,4 @@ ICOM_DEFINE(IContextMenu,IUnknown)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_WINE_OBJ_ICONTEXTMENU_H */
+#endif /* __WINE_WINE_OBJ_CONTEXTMENU_H */

include/wine/obj_dockingwindowframe.h

@@ -2,8 +2,8 @@
  *    IDockingWindowFrame
  */
 
-#ifndef __WINE_WINE_OBJ_IDOCKINGWINDOWFRAME_H
-#define __WINE_WINE_OBJ_IDOCKINGWINDOWFRAME_H
+#ifndef __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
+#define __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
 
 #include "winbase.h"
 #include "winuser.h"
@@ -47,4 +47,4 @@ ICOM_DEFINE(IDockingWindowFrame,IOleWindow)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_WINE_OBJ_IDOCKINGWINDOWFRAME_H */
+#endif /* __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H */

include/wine/obj_extracticon.h

@@ -2,8 +2,8 @@
  *    IExtractIconA
  */
 
-#ifndef __WINE_WINE_OBJ_IEXTRACTICONA_H
-#define __WINE_WINE_OBJ_IEXTRACTICONA_H
+#ifndef __WINE_WINE_OBJ_EXTRACTICON_H
+#define __WINE_WINE_OBJ_EXTRACTICON_H
 
 #include "winbase.h"
 #include "winuser.h"
@@ -54,4 +54,5 @@ ICOM_DEFINE(IExtractIconA,IUnknown)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_WINE_OBJ_IEXTRACTICONA_H */
+#endif /* __WINE_WINE_OBJ_EXTRACTICON_H */
+

include/wine/obj_shellbrowser.h

@@ -2,8 +2,8 @@
  *    IShellBrowser
  */
 
-#ifndef __WINE_WINE_OBJ_ISHELLBROWSER_H
-#define __WINE_WINE_OBJ_ISHELLBROWSER_H
+#ifndef __WINE_WINE_OBJ_SHELLBROWSER_H
+#define __WINE_WINE_OBJ_SHELLBROWSER_H
 
 #include "winbase.h"
 #include "winuser.h"
@@ -110,4 +110,4 @@ ICOM_DEFINE(IShellBrowser,IOleWindow)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_WINE_OBJ_ISHELLBROWSER_H */
+#endif /* __WINE_WINE_OBJ_SHELLBROWSER_H */

include/wine/obj_shellextinit.h

@@ -2,8 +2,8 @@
  *    IShellExtInit
  */
 
-#ifndef __WINE_WINE_OBJ_ISHELLEXTINIT_H
-#define __WINE_WINE_OBJ_ISHELLEXTINIT_H
+#ifndef __WINE_WINE_OBJ_SHELLEXTINIT_H
+#define __WINE_WINE_OBJ_SHELLEXTINIT_H
 
 #include "winbase.h"
 #include "winuser.h"
@@ -37,4 +37,4 @@ ICOM_DEFINE(IShellExtInit,IUnknown)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_WINE_OBJ_ISHELLEXTINIT_H */
+#endif /* __WINE_WINE_OBJ_SHELLEXTINIT_H */

include/wine/obj_shellview.h

@@ -2,8 +2,8 @@
  *    IShellView
  */
 
-#ifndef __WINE_WINE_OBJ_ISHELLVIEW_H
-#define __WINE_WINE_OBJ_ISHELLVIEW_H
+#ifndef __WINE_WINE_OBJ_SHELLVIEW_H
+#define __WINE_WINE_OBJ_SHELLVIEW_H
 
 #include "winbase.h"
 #include "winuser.h"
@@ -147,4 +147,4 @@ ICOM_DEFINE(IShellView,IOleWindow)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* __WINE_WINE_OBJ_ISHELLVIEW_H */
+#endif /* __WINE_WINE_OBJ_SHELLVIEW_H */

include/wine/shell16.h

-#ifndef _SHELL16_H
-#define _SHELL16_H
+#ifndef __WINE_WINE_SHELL16_H
+#define __WINE_WINE_SHELL16_H
+
+#include "windef.h"
 
 BOOL16      WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
 BOOL      WINAPI AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
 
 
-#endif /* _SHELL16_H */
+#endif /* __WINE_WINE_SHELL16_H */

include/wine/w32skrnl.h

-#ifndef _W32SKRNL_H
-#define _W32SKRNL_H
+#ifndef __WINE_WINE_W32SKRNL_H
+#define __WINE_WINE_W32SKRNL_H
+
 #include "windef.h"
+
 LPSTR WINAPI GetWin32sDirectory(void);
 DWORD WINAPI RtlNtStatusToDosError(DWORD error);
-#endif /* _W32SKRNL_H */
+
+#endif /* __WINE_WINE_W32SKRNL_H */

include/wine/winbase16.h

-#ifndef _INCLUDE_WINE_WINBASE16_H
-#define _INCLUDE_WINE_WINBASE16_H
+#ifndef __WINE_WINE_WINBASE16_H
+#define __WINE_WINE_WINBASE16_H
 
 #include "windef.h"
 #include "pshpack1.h"
@@ -210,4 +210,4 @@ SEGPTR      WINAPI WIN16_LockResource16(HGLOBAL16);
 LONG        WINAPI WIN16_hread(HFILE16,SEGPTR,LONG);
 UINT16      WINAPI WIN16_lread(HFILE16,SEGPTR,UINT16);
 
-#endif /* _INCLUDE_WINE_WINBASE16_H */
+#endif /* __WINE_WINE_WINBASE16_H */

include/wine/winesound.h

-#ifndef _WINE_SOUND_H
-#define _WINE_SOUND_H
+#ifndef __WINE_WINE_WINESOUND_H
+#define __WINE_WINE_WINESOUND_H
 
 #include "windef.h"
 
@@ -35,4 +35,4 @@ DWORD       WINAPI SyncAllVoices(void);
 INT16       WINAPI WaitSoundState16(INT16);
 DWORD       WINAPI WaitSoundState(DWORD);
 
-#endif /* _WINE_SOUND_H */
+#endif /* __WINE_WINE_WINESOUND_H */

include/wine/winestring.h

-#ifndef _INCLUDE_WINE_STRINGS_H
-#define _INCLUDE_WINE_STRINGS_H
+#ifndef __WINE_WINE_WINESTRING_H
+#define __WINE_WINE_WINESTRING_H
 
 #include "windef.h"
 
@@ -17,4 +17,5 @@ LPWSTR      WINAPI lstrcpyAtoW(LPWSTR,LPCSTR);
 LPSTR       WINAPI lstrcpyWtoA(LPSTR,LPCWSTR);
 LPWSTR      WINAPI lstrcpynAtoW(LPWSTR,LPCSTR,INT);
 LPSTR       WINAPI lstrcpynWtoA(LPSTR,LPCWSTR,INT);
-#endif /* _INCLUDE_WINE_STRINGS_H */
+
+#endif /* __WINE_WINE_WINESTRING_H */

include/wine/wingdi16.h

-#ifndef __WINE_WINGDI16_H
-#define __WINE_WINGDI16_H
+#ifndef __WINE_WINE_WINGDI16_H
+#define __WINE_WINE_WINGDI16_H
 
 #include "wingdi.h"
 
@@ -528,4 +528,4 @@ int         WINAPI WriteDialog16(HANDLE16,LPSTR,WORD);
 int         WINAPI WriteSpool16(HANDLE16,LPSTR,WORD);
 
 
-#endif /* __WINE_WINGDI16_H */
+#endif /* __WINE_WINE_WINGDI16_H */

include/wine/winuser16.h

-#ifndef __WINE_WINUSER16_H
-#define __WINE_WINUSER16_H
+#ifndef __WINE_WINE_WINUSER16_H
+#define __WINE_WINE_WINUSER16_H
 
 #include "winuser.h" /* winuser.h needed for MSGBOXCALLBACK */
                      /* wingdi.h needed for COLORREF */
@@ -950,4 +950,4 @@ BOOL16      WINAPI GrayString16(HDC16,HBRUSH16,GRAYSTRINGPROC16,LPARAM,
 BOOL16      WINAPI EnumTaskWindows16(HTASK16,WNDENUMPROC16,LPARAM);
 
 
-#endif /* __WINE_WINUSER16_H */
+#endif /* __WINE_WINE_WINUSER16_H */

include/wine_gl.h

@@ -4,8 +4,8 @@
    This wrapper is needed because Mesa uses also the CALLBACK / WINAPI
    constants. */
 
-#ifndef __WINE_GL_H
-#define __WINE_GL_H
+#ifndef __WINE_WINE_GL_H
+#define __WINE_WINE_GL_H
 
 #include "config.h"
 
@@ -38,4 +38,4 @@
 
 #endif /* HAVE_LIBMESAGL */
 
-#endif /* __WINE_GL_H */
+#endif /* __WINE_WINE_GL_H */

include/winnt.h

@@ -54,6 +54,23 @@
 
 /* Types */
 
+/* TCHAR data types definitions for Winelib. */
+/* These types are _not_ defined for the emulator, because they */
+/* depend on the UNICODE macro that only exists in user's code. */
+
+#ifndef __WINE__
+# ifdef UNICODE
+typedef LPWSTR LPTSTR;
+typedef LPCWSTR LPCTSTR;
+#define __TEXT(string) L##string /*probably wrong */
+# else  /* UNICODE */
+typedef LPSTR LPTSTR;
+typedef LPCSTR LPCTSTR;
+#define __TEXT(string) string
+# endif /* UNICODE */
+#endif   /* __WINE__ */
+#define TEXT(quote) __TEXT(quote)
+
 typedef BYTE     BOOLEAN;
 typedef BOOLEAN *PBOOLEAN;
 

include/winuser.h

-#ifndef __INCLUDE_WINUSER_H
-#define __INCLUDE_WINUSER_H
+#ifndef _WINUSER_
+#define _WINUSER_
 
 #ifndef RC_INVOKED
 #include <stdarg.h>
@@ -3622,4 +3622,4 @@ VOID        WINAPI ScreenSwitchEnable16(WORD);
 }
 #endif
 
-#endif /* __INCLUDE_WINUSER_H */
+#endif /* _WINUSER_ */

include/wnaspi32.h

-#if !defined(WNASPI32_H)
-#define WNASPI32_H
+#ifndef __WINE_WNASPI32_H
+#define __WINE_WNASPI32_H
+
+#include "windef.h"
 
 #include "pshpack1.h"
 
@@ -99,4 +101,4 @@ typedef union SRB SRB;
 
 #include "poppack.h"
 
-#endif
+#endif /* __WINE_WNASPI32_H */

include/wrc_rsc.h

@@ -5,8 +5,7 @@
  *
  */
 
-#if !defined(__WRC_RSC_H) && !defined(__WINE_WRC_RSC_H)
-#define __WRC_RSC_H
+#ifndef __WINE_WRC_RSC_H
 #define __WINE_WRC_RSC_H
 
 #include "windef.h"		/* For types in structure */
@@ -40,5 +39,5 @@ typedef struct wrc_resource32
 	UINT	datasize;	/* The size of the resource */
 } wrc_resource32_t;
 
-#endif
+#endif /* __WINE_WRC_RSC_H */
 

misc/ddeml.c

@@ -17,6 +17,7 @@
 #include "heap.h"
 #include "shm_semaph.h"
 #include "debug.h"
+#include "tchar.h"
 #include "winnt.h"
 
 DEFAULT_DEBUG_CHANNEL(ddeml)
@@ -302,7 +303,7 @@ static void InsertHSZNode( HSZ hsz )
  *  1.1	     Mar 1999  Keith Matthews	     Corrected Heap handling. Corrected re-initialisation handling
  *
  */
- DWORD Release_reserved_mutex (HANDLE mutex, LPTSTR mutex_name, BOOL release_handle_m, BOOL release_this_i )
+static DWORD Release_reserved_mutex (HANDLE mutex, LPSTR mutex_name, BOOL release_handle_m, BOOL release_this_i )
 {
 	ReleaseMutex(mutex);
         if ( (err_no=GetLastError()) != 0 )
@@ -411,7 +412,7 @@ void FindNotifyMonitorCallbacks(DWORD ThisInstance, DWORD DdeEvent )
  *
  */
 
-DdeReserveAtom( DDE_HANDLE_ENTRY * reference_inst,HSZ hsz)
+void DdeReserveAtom( DDE_HANDLE_ENTRY * reference_inst,HSZ hsz)
 {
   CHAR SNameBuffer[MAX_BUFFER_LEN];
   UINT rcode;
@@ -441,7 +442,7 @@ DdeReserveAtom( DDE_HANDLE_ENTRY * reference_inst,HSZ hsz)
  *
  */
 
-DdeReleaseAtom( DDE_HANDLE_ENTRY * reference_inst,HSZ hsz)
+void DdeReleaseAtom( DDE_HANDLE_ENTRY * reference_inst,HSZ hsz)
 {
   CHAR SNameBuffer[MAX_BUFFER_LEN];
   UINT rcode;

tools/make_X11wrappers

@@ -82,8 +82,8 @@ foreach $name (@dolist) {
  * Copyright 1998 Kristian Nielsen
  */
 
-#ifndef __WINE_TS$ucname\_H
-#define __WINE_TS$ucname\_H
+#ifndef __WINE_TS_$ucname\_H
+#define __WINE_TS_$ucname\_H
 
 #include "config.h"
 
@@ -344,7 +344,7 @@ END
 $post_file
 #endif /* !defined(X_DISPLAY_MISSING) */
 
-#endif /* __WINE_TS$ucname\_H */
+#endif /* __WINE_TS_$ucname\_H */
 END
     print OUTC <<END;
 

tools/unimap.pl

@@ -53,7 +53,13 @@ print OUT " * Automatically generated file -- do not edit!\n";
 print OUT " * (Use tools/unimap.pl for generation)\n";
 print OUT " *\n";
 print OUT " * Mapping tables for Unicode case conversion\n";
-print OUT " */\n\n";
+print OUT " */\n";
+print OUT "\n";
+print OUT "#ifndef __WINE_CASEMAP_H\n";
+print OUT "#define __WINE_CASEMAP_H\n";
+print OUT "\n";
+print OUT "#include \"windef.h\"\n";
+print OUT "\n";
 
 #Write out the non-trivial mappings
 for ($high = 0; $high < 256; $high++) {
@@ -116,6 +122,8 @@ for ($i = 0; $i < 256; $i += 8) {
 	printf OUT "\t%06s, %06s, %06s, %06s, %06s, %06s, %06s, %06s,\n",
 		@patch;
 }
-print OUT "};\n\n";
+print OUT "};\n";
+print OUT "\n";
+print OUT "#endif /* !defined(__WINE_CASEMAP_H) */\n";
 
 close(OUT);

tools/wrc/writeres.c

@@ -63,12 +63,13 @@ char h_file_head_str[] =
 	" * Source : %s\n"
 	" * Cmdline: %s\n"
 	" * Date   : %s"
-	" */\n\n"
+	" */\n"
+        "\n"
 	"#ifndef __%08lx_H\n"	/* This becomes the date of compile */
-	"#define __%08lx_H\n\n"
-	"#ifndef __WRC_RSC_H\n"
+	"#define __%08lx_H\n"
+	"\n"
 	"#include <wrc_rsc.h>\n"
-	"#endif\n\n"
+	"\n"
 	;
 
 char h_file_tail_str[] =