Clean up mess from duplicate patches.

contrib/intarray/_int.c

@@ -14,7 +14,6 @@
 
 #include <float.h>
 
-#include "catalog/pg_type.h"
 #include "access/gist.h"
 #include "access/itup.h"
 #include "access/rtree.h"
@@ -927,7 +926,6 @@ new_intArrayType(int num)
 	r->flags &= ~LEAFKEY;
 	*((int *) ARR_DIMS(r)) = num;
 	*((int *) ARR_LBOUND(r)) = 1;
-	ARR_ELEMTYPE(r) = INT4OID;
 
 	return r;
 }