diff --git a/reactos/include/WinDNS.h b/reactos/include/WinDNS.h
index 45fa4338f89..438dafeead5 100644
--- a/reactos/include/WinDNS.h
+++ b/reactos/include/WinDNS.h
@@ -325,11 +325,11 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_A
   PVOID Credentials, 
   HANDLE *ContextHandle );
 
-DNS_STATUS DnsValidateName_W
+DNS_STATUS WINAPI DnsValidateName_W
 ( LPCWSTR Name, DNS_NAME_FORMAT Format );
-DNS_STATUS DnsValidateName_UTF8
+DNS_STATUS WINAPI DnsValidateName_UTF8
 ( LPCSTR Name, DNS_NAME_FORMAT Format );
-DNS_STATUS DnsValidateName_A
+DNS_STATUS WINAPI DnsValidateName_A
 ( LPCSTR Name, DNS_NAME_FORMAT Format );
 
 DNS_STATUS WINAPI DnsQuery_W
diff --git a/reactos/include/base.h b/reactos/include/base.h
index a74d72639db..848727e9453 100644
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -150,7 +150,7 @@ typedef HANDLE HWND;
 typedef HANDLE HRAWINPUT;
 typedef HANDLE HTASK;
 typedef HANDLE HWINEVENTHOOK;
-typedef VOID (CALLBACK* WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime);
+typedef VOID CALLBACK(* WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime);
 typedef unsigned short LANGID;
 /*typedef DWORD LCID; */
 typedef DWORD LCTYPE;
@@ -355,7 +355,7 @@ typedef enum _SID_NAME_USE {
 #define GetBValue(rgb)   ((BYTE) ((rgb) >> 16)) 
 #define GetGValue(rgb)   ((BYTE) (((WORD) (rgb)) >> 8)) 
 #define GetRValue(rgb)   ((BYTE) (rgb)) 
-#define RGB(r,g,b)          ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
+#define RGB(r, g ,b)  ((DWORD) (((BYTE) (r) | ((WORD) (g) << 8)) | (((DWORD) (BYTE) (b)) << 16))) 
 
 #define HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) (fn)((hwnd), (int)(wParam), (NMHDR FAR*)(lParam)) 
 
@@ -552,7 +552,7 @@ typedef WINBOOL CALLBACK (*DATEFMT_ENUMPROCW) (LPWSTR);
 typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCA) (LPSTR);
 typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCW) (LPWSTR);
 typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCA) (LPSTR);
-typedef int (CALLBACK* EMFPLAYPROC)( HDC hdc, INT iFunction, HANDLE hPageQuery );
+typedef int CALLBACK (*EMFPLAYPROC)( HDC hdc, INT iFunction, HANDLE hPageQuery );
 typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCW) (LPWSTR);
 typedef WINBOOL CALLBACK (*PHANDLER_ROUTINE) (DWORD);
 typedef VOID CALLBACK (*LPHANDLER_FUNCTION) (DWORD);
@@ -636,18 +636,18 @@ typedef WINBOOL CALLBACK (*PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR
 #define SE_CHANGE_NOTIFY_NAME             TEXT("SeChangeNotifyPrivilege")
 #define SE_REMOTE_SHUTDOWN_NAME           TEXT("SeRemoteShutdownPrivilege")
 
-typedef BOOL (CALLBACK* LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR);
-typedef BOOL (CALLBACK* LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR);
-typedef BOOL (CALLBACK* UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR);
-typedef BOOL (CALLBACK* DATEFMT_ENUMPROCEXA)(LPSTR, CALID);
-typedef BOOL (CALLBACK* CALINFO_ENUMPROCEXA)(LPSTR, CALID);
+typedef BOOL CALLBACK (*LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR);
+typedef BOOL CALLBACK (*LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR);
+typedef BOOL CALLBACK (*UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR);
+typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXA)(LPSTR, CALID);
+typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXA)(LPSTR, CALID);
 
-typedef BOOL (CALLBACK* LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR);
-typedef BOOL (CALLBACK* LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR);
-typedef BOOL (CALLBACK* UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR);
-typedef BOOL (CALLBACK* DATEFMT_ENUMPROCEXW)(LPWSTR, CALID);
-typedef BOOL (CALLBACK* CALINFO_ENUMPROCEXW)(LPWSTR, CALID);
-typedef BOOL (CALLBACK* GEO_ENUMPROC)(GEOID);
+typedef BOOL CALLBACK (*LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR);
+typedef BOOL CALLBACK (*LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR);
+typedef BOOL CALLBACK (*UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR);
+typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXW)(LPWSTR, CALID);
+typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXW)(LPWSTR, CALID);
+typedef BOOL CALLBACK (*GEO_ENUMPROC)(GEOID);
 
 #define SERVICES_ACTIVE_DATABASEW      L"ServicesActive"
 #define SERVICES_FAILED_DATABASEW      L"ServicesFailed"
@@ -700,13 +700,13 @@ typedef enum {
     LT_LOWEST_LATENCY
 } LATENCY_TIME;
 
-typedef LONG (CALLBACK *PVECTORED_EXCEPTION_HANDLER)(
+typedef LONG CALLBACK (*PVECTORED_EXCEPTION_HANDLER)(
     struct _EXCEPTION_POINTERS *ExceptionInfo
     );
 
 typedef
 VOID
-(CALLBACK *PAPCFUNC)(
+CALLBACK (*PAPCFUNC)(
     ULONG_PTR dwParam
     );
 
@@ -716,10 +716,10 @@ VOID
 #define REFGUID const GUID *
 #endif
 
-typedef DWORD (CALLBACK *PFE_EXPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,ULONG ulLength);
+typedef DWORD CALLBACK (*PFE_EXPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,ULONG ulLength);
 
-typedef DWORD (CALLBACK *PFE_IMPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,PULONG ulLength);
-typedef VOID (CALLBACK *PFIBER_START_ROUTINE)(
+typedef DWORD CALLBACK (*PFE_IMPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,PULONG ulLength);
+typedef VOID CALLBACK (*PFIBER_START_ROUTINE)(
     LPVOID lpFiberParameter
     );
 typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE;
@@ -729,7 +729,7 @@ typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE {
     HighMemoryResourceNotification
 } MEMORY_RESOURCE_NOTIFICATION_TYPE;
 
-typedef VOID (CALLBACK* WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
+typedef VOID CALLBACK (*WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
 typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK;
 /* End of stuff from ddeml.h in old Cygnus headers */
 /* ----------------------------------------------- */
diff --git a/reactos/include/defines.h b/reactos/include/defines.h
index 9f91a9f960a..8ce4fc7f8b4 100644
--- a/reactos/include/defines.h
+++ b/reactos/include/defines.h
@@ -2800,25 +2800,13 @@ extern "C" {
 #define SPIF_SENDCHANGE	(2)
 
 /* TrackPopupMenu, TrackPopMenuEx */
-#define TPM_LEFTBUTTON	(0)
-#define TPM_RIGHTBUTTON	(2)
-#define TPM_LEFTALIGN	(0)
-#define TPM_CENTERALIGN	(4)
-#define TPM_RIGHTALIGN	(8)
-#define TPM_TOPALIGN	(0)
-#define TPM_VCENTERALIGN	(16)
-#define TPM_BOTTOMALIGN	(32)
-#define TPM_HORIZONTAL	(0)
-#define TPM_VERTICAL	(64)
-#define TPM_NONOTIFY	(128)
-#define TPM_RETURNCMD	(256)
-#define TPM_RECURSE	(1)
-#define TPM_HORPOSANIMATION	(1024)
-#define TPM_HORNEGANIMATION	(2048)
-#define TPM_VERPOSANIMATION	(4096)
-#define TPM_VERNEGANIMATION	(8192)
-#define TPM_NOANIMATION	(16384)
-#define TPM_LAYOUTRTL	(32768)
+#define TPM_CENTERALIGN	(0x4L)
+#define TPM_LEFTALIGN	(0L)
+#define TPM_RIGHTALIGN	(0x8L)
+#define TPM_LEFTBUTTON	(0L)
+#define TPM_RIGHTBUTTON	(0x2L)
+#define TPM_HORIZONTAL	(0L)
+#define TPM_VERTICAL	(0x40L)
 
 /* TranslateCharsetInfo */
 #define TCI_SRCCHARSET	(1)
diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 31d8ca2aafe..4c219e87c48 100644
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -38,7 +38,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 typedef
-DWORD (CALLBACK *PPROGRESS_ROUTINE)(
+DWORD CALLBACK (*PPROGRESS_ROUTINE)(
 	LARGE_INTEGER TotalFileSize,
 	LARGE_INTEGER TotalBytesTransferred,
 	LARGE_INTEGER StreamSize,
@@ -1710,7 +1710,7 @@ RtlSetCriticalSectionSpinCount(
 
 typedef
 VOID
-(CALLBACK *POVERLAPPED_COMPLETION_ROUTINE)(
+CALLBACK (*POVERLAPPED_COMPLETION_ROUTINE)(
     DWORD dwErrorCode,
     DWORD dwNumberOfBytesTransfered,
     LPOVERLAPPED lpOverlapped
@@ -6778,7 +6778,7 @@ TlsFree(
 	DWORD dwTlsIndex
 	);
 
-typedef VOID STDCALL (*PFLS_CALLBACK_FUNCTION)(PVOID lpFlsData);
+typedef VOID STDCALL_FUNC (*PFLS_CALLBACK_FUNCTION)(PVOID lpFlsData);
 
 DWORD STDCALL FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback);
 
diff --git a/reactos/include/structs.h b/reactos/include/structs.h
index f3ec91c4fb5..96579562746 100644
--- a/reactos/include/structs.h
+++ b/reactos/include/structs.h
@@ -510,7 +510,7 @@ typedef struct _RTL_RANGE {
 
 typedef
 BOOLEAN
-(CALLBACK *PRTL_CONFLICT_RANGE_CALLBACK) (
+CALLBACK (*PRTL_CONFLICT_RANGE_CALLBACK) (
 PVOID Context,
 PRTL_RANGE Range
     );