diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 30b93121124..22a73310ca9 100644
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-23  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* decContext.h: Properly guard inclusion of stdint.h
+	* decContext.c: Include config.h
+	* decLibrary.c: Ditto.
+	* decNumber.c: Ditto.
+	* decRound.c: Ditto.
+	* decUtility.c: Ditto.
+	* decimal32.c: Ditto.
+	* decimal64.c: Ditto.
+	* decimal128.c: Ditto.
+	
 2005-11-29  Ben Elliston  <bje@au.ibm.com>
 
 	* decUtility.c: Remove redundant #includes.
diff --git a/libdecnumber/decContext.c b/libdecnumber/decContext.c
index 26a7f3bcf4a..93bc2c943d4 100644
--- a/libdecnumber/decContext.c
+++ b/libdecnumber/decContext.c
@@ -23,6 +23,7 @@
     context structures. */
 
 #include <string.h>		/* for strcmp */
+#include "config.h"
 #include "decContext.h"		/* context and base types */
 #include "decNumberLocal.h"	/* decNumber local types, etc. */
 
diff --git a/libdecnumber/decContext.h b/libdecnumber/decContext.h
index d011f4f6337..201102526ea 100644
--- a/libdecnumber/decContext.h
+++ b/libdecnumber/decContext.h
@@ -40,7 +40,9 @@
 #define DECCFULLNAME "Decimal Context Descriptor"	/* Verbose name */
 #define DECCAUTHOR   "Mike Cowlishaw"	/* Who to blame */
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>		/* C99 standard integers */
+#endif
 #include <signal.h>		/* for traps */
 
 
diff --git a/libdecnumber/decLibrary.c b/libdecnumber/decLibrary.c
index b7cbd109b25..7cfd9b2b952 100644
--- a/libdecnumber/decLibrary.c
+++ b/libdecnumber/decLibrary.c
@@ -18,6 +18,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
+#include "config.h"
 #include "decContext.h"
 #include "decimal128.h"
 #include "decimal64.h"
diff --git a/libdecnumber/decNumber.c b/libdecnumber/decNumber.c
index c2a89800680..08fa00d8486 100644
--- a/libdecnumber/decNumber.c
+++ b/libdecnumber/decNumber.c
@@ -153,6 +153,7 @@
 #include <stdio.h>		/* for printf [if needed] */
 #include <string.h>		/* for strcpy */
 #include <ctype.h>		/* for lower */
+#include "config.h"
 #include "decNumber.h"		/* base number library */
 #include "decNumberLocal.h"	/* decNumber local types, etc. */
 
diff --git a/libdecnumber/decRound.c b/libdecnumber/decRound.c
index d3726665e13..0a85cb136a7 100644
--- a/libdecnumber/decRound.c
+++ b/libdecnumber/decRound.c
@@ -18,6 +18,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
+#include "config.h"
 #include "decContext.h"
 
 #define FE_DEC_DOWNWARD 0
diff --git a/libdecnumber/decUtility.c b/libdecnumber/decUtility.c
index f40ebd46012..c1aa0fde229 100644
--- a/libdecnumber/decUtility.c
+++ b/libdecnumber/decUtility.c
@@ -19,6 +19,7 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
+#include "config.h"
 #include "decNumber.h"          /* base number library */
 #include "decNumberLocal.h"     /* decNumber local types, etc. */
 #include "decUtility.h"         /* utility routines */
diff --git a/libdecnumber/decimal128.c b/libdecnumber/decimal128.c
index 214dba0f1be..94efd3dcba1 100644
--- a/libdecnumber/decimal128.c
+++ b/libdecnumber/decimal128.c
@@ -31,6 +31,7 @@
 #include <stdio.h>		/* [for printf] */
 
 #define  DECNUMDIGITS 34	/* we need decNumbers with space for 34 */
+#include "config.h"
 #include "decNumber.h"		/* base number library */
 #include "decNumberLocal.h"	/* decNumber local types, etc. */
 #include "decimal128.h"		/* our primary include */
diff --git a/libdecnumber/decimal32.c b/libdecnumber/decimal32.c
index 20bdf28b6c1..e1596409370 100644
--- a/libdecnumber/decimal32.c
+++ b/libdecnumber/decimal32.c
@@ -31,6 +31,7 @@
 #include <stdio.h>		/* [for printf] */
 
 #define  DECNUMDIGITS  7	/* we need decNumbers with space for 7 */
+#include "config.h"
 #include "decNumber.h"		/* base number library */
 #include "decNumberLocal.h"	/* decNumber local types, etc. */
 #include "decimal32.h"		/* our primary include */
diff --git a/libdecnumber/decimal64.c b/libdecnumber/decimal64.c
index c6e2394823f..f7b4d04dfb4 100644
--- a/libdecnumber/decimal64.c
+++ b/libdecnumber/decimal64.c
@@ -31,6 +31,7 @@
 #include <stdio.h>		/* [for printf] */
 
 #define  DECNUMDIGITS 16	/* we need decNumbers with space for 16 */
+#include "config.h"
 #include "decNumber.h"		/* base number library */
 #include "decNumberLocal.h"	/* decNumber local types, etc. */
 #include "decimal64.h"		/* our primary include */