diff --git a/include/ChangeLog b/include/ChangeLog
index dfa63d4c..0fbfe0a3 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-15  Marcel Telka  <marcel@telka.sk>
+
+	* stdint/stdint-hwbench.h: Changed comments. Disabled macros for C++ via
+		__STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS.
+	* stdint/stdint-win32.h: Disabled macros for C++ via __STDC_LIMIT_MACROS
+		and __STDC_CONSTANT_MACROS.
+
 2005-07-15  Marcel Telka  <marcel@telka.sk>
 
 	* acinclude.m4 (AX_CREATE_STDINT_H): Fixed typo (unsinged -> unsigned).
diff --git a/include/NEWS b/include/NEWS
index 548726f5..db4e1c0c 100644
--- a/include/NEWS
+++ b/include/NEWS
@@ -5,6 +5,8 @@ include-0.4.1:
 	* Updated stdint.h support from latest ac-archive package for better conformance
 		with SUSv3 standard.
 	* Fixed typo (compiler error) in common stdint.h implementation.
+	* Increased conformance of Win32 and Hitachi Workbench/IAR Compiler stdint.h
+		implementations with ISO C99.
 
 include-0.4 (2005-07-12):
 
diff --git a/include/stdint/stdint-hwbench.h b/include/stdint/stdint-hwbench.h
index 64d9972d..51a28967 100644
--- a/include/stdint/stdint-hwbench.h
+++ b/include/stdint/stdint-hwbench.h
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * stdint.h - integer types for Hitachi Workbench
+ * stdint.h - integer types for Hitachi Workbench/IAR Compiler
  * Copyright (C) 2005 Elcom s.r.o.
  * All rights reserved.
  *
@@ -82,6 +82,8 @@ typedef unsigned long uintptr_t;
 typedef long intmax_t;
 typedef unsigned long uintmax_t;
 
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+
 /*
  * Limits of Specified-Width Interger Types
  */
@@ -151,7 +153,7 @@ typedef unsigned long uintmax_t;
 
 /* Limits of sig_atomic_t */
 
-/* N/A for Hitachi Workbench */
+/* N/A for Hitachi Workbench/IAR Compiler */
 
 /* Limit of size_t */
 
@@ -164,7 +166,11 @@ typedef unsigned long uintmax_t;
 
 /* Limits of wint_t */
 
-/* wint_t not supported in Hitachi Workbench */
+/* wint_t not supported in Hitachi Workbench/IAR Compiler */
+
+#endif /* __STDC_LIMIT_MACROS */
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
 
 /*
  * Macros for Integer Constant Expressions
@@ -185,4 +191,6 @@ typedef unsigned long uintmax_t;
 #define INTMAX_C(value)         INT32_C(value)
 #define UINTMAX_C(value)        UINT32_C(value)
 
+#endif /* __STDC_CONSTANT_MACROS */
+
 #endif /* STDINT_H */
diff --git a/include/stdint/stdint-win32.h b/include/stdint/stdint-win32.h
index 413e7aa9..3d2e9a30 100644
--- a/include/stdint/stdint-win32.h
+++ b/include/stdint/stdint-win32.h
@@ -86,6 +86,8 @@ typedef UINT_PTR uintptr_t;
 typedef INT64 intmax_t;
 typedef UINT64 uintmax_t;
 
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+
 /*
  * Limits of Specified-Width Integer Types
  */
@@ -180,6 +182,10 @@ typedef UINT64 uintmax_t;
 #define	WINT_MIN		WCHAR_MIN
 #define	WINT_MAX		WCHAR_MAX
 
+#endif /* __STDC_LIMIT_MACROS */
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
+
 /*
  * Macros for Integer Constant Expressions
  */
@@ -201,4 +207,6 @@ typedef UINT64 uintmax_t;
 #define	INTMAX_C(value)		INT64_C(value)
 #define	UINTMAX_C(value)	UINT64_C(value)
 
+#endif /* __STDC_CONSTANT_MACROS */
+
 #endif /* STDINT_H */