diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index 6f346f94fe..09c6be5487 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -1,5 +1,6 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
+#include "utils/timestamp.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index b9da2dda2f..5943483a65 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -1,3 +1,5 @@
+#include <math.h>
+
 #include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/builtins.h"
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index 379f1e0a60..fd5e63e2bb 100644
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -1,6 +1,7 @@
 #include "btree_gist.h"
 #include "btree_utils_num.h"
 #include "utils/date.h"
+#include "utils/timestamp.h"
 
 typedef struct
 {
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index b2eb5dc869..555410c08f 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -1,6 +1,8 @@
 #ifndef __BTREE_UTILS_NUM_H__
 #define __BTREE_UTILS_NUM_H__
 
+#include <math.h>
+
 #include "btree_gist.h"
 
 typedef char GBT_NUMKEY;
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 62d7994be6..17aaa9d975 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -1,3 +1,5 @@
+#include <math.h>
+
 #include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/pg_locale.h"
diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index d504601ae0..13d3f2164f 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.3 2006/05/30 22:12:13 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.4 2006/07/13 16:57:31 momjian Exp $
  *
  * Copyright (c) 2005-2006	Tatsuo Ishii
  *
@@ -27,6 +27,7 @@
 #include "funcapi.h"
 #include "access/heapam.h"
 #include "access/transam.h"
+#include "access/xact.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
 #include "storage/proc.h"
diff --git a/contrib/tsearch2/ginidx.c b/contrib/tsearch2/ginidx.c
index 0a4e04e64a..4ba3fc62a0 100644
--- a/contrib/tsearch2/ginidx.c
+++ b/contrib/tsearch2/ginidx.c
@@ -4,6 +4,7 @@
 
 #include "access/gist.h"
 #include "access/itup.h"
+#include "access/skey.h"
 #include "access/tuptoaster.h"
 #include "storage/bufpage.h"
 #include "utils/array.h"