diff --git a/pom.xml b/pom.xml
index b884075aec..ab9174af0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,13 +41,10 @@
               -->
               <exclude>**/*.md</exclude>
               <exclude>**/*.in</exclude>
-              <exclude>**/*.mk</exclude>
-              <exclude>**/*.mak</exclude>
               <exclude>**/*.md5</exclude>
               <exclude>**/*.json</exclude>
               <exclude>**/*.ans</exclude>
               <exclude>**/*.sql</exclude>
-              <exclude>**/*.yaml</exclude>
               <exclude>**/*.out</exclude>
               <exclude>**/*.po</exclude>
               <exclude>**/*.map</exclude>
@@ -59,22 +56,19 @@
               <exclude>**/*.csv</exclude>
               <exclude>**/*.pm</exclude>
               <exclude>**/*.1</exclude>
-              <exclude>**/*.m4</exclude>
               <exclude>**/*.sample</exclude>
               <exclude>configure</exclude>
               <exclude>config/*</exclude>
               <exclude>*version</exclude>
               <exclude>**/*.pgc</exclude>
-              <exclude>**/*.rc</exclude>
-              <exclude>**/*.f</exclude>
               <exclude>**/*.cnf</exclude>
               <exclude>**/*.stx</exclude>
               <exclude>**/*.gdb</exclude>
               <exclude>**/__init__.py</exclude>
-              <exclude>**/Makefile*</exclude>
               <exclude>README-PostgreSQL</exclude>
               <exclude>contrib/gp_sparse_vector/bugs</exclude>
               <exclude>contrib/hawq-hadoop/hawq-mapreduce-tool/src/test/resources/dataset</exclude>
+              <exclude>contrib/hawq-hadoop/**/*.yaml</exclude>
               <exclude>contrib/gp_sparse_vector/*output</exclude>
               <exclude>contrib/gp_sparse_vector/README*</exclude>
               <exclude>contrib/orafce/*</exclude>
@@ -88,170 +82,11 @@
               <exclude>depends/libyarn/gmock/COPYING</exclude>
               <exclude>depends/libyarn/gtest/**/*.cc</exclude>
               <exclude>depends/libyarn/gtest/**/*.h</exclude>
-              <exclude>depends/libyarn/releng/**</exclude>
               <exclude>depends/libyarn/**/Makefile</exclude>
               <exclude>doc/**/*.sgml</exclude>
               <exclude>pxf/*.gradle</exclude>
               <exclude>pxf/gradlew</exclude>
-              <exclude>pxf/**/*.classpath</exclude>
-              <exclude>src/backend/access/appendonly/aomd.c</exclude>
-              <exclude>src/backend/access/appendonly/aosegfiles.c</exclude>
-              <exclude>src/backend/access/appendonly/appendonlyam.c</exclude>
-              <exclude>src/backend/access/appendonly/appendonlywriter.c</exclude>
-              <exclude>src/backend/access/bitmap/*.c</exclude>
-              <exclude>src/backend/access/common/**/*.c</exclude>	
-              <exclude>src/backend/access/external/url.i</exclude>
-              <exclude>src/backend/access/gin/*.c</exclude>
-              <exclude>src/backend/access/gist/*.c</exclude>
-              <exclude>src/backend/access/hash/*.c</exclude>
-              <exclude>src/backend/access/heap/*.c</exclude>
-              <exclude>src/backend/access/index/*.*</exclude>
-              <exclude>src/backend/access/nbtree/*.c</exclude>
-              <exclude>src/backend/access/transam/**/*.c</exclude>
-              <exclude>src/backend/access/catalog/**/*.*</exclude>
-              <exclude>src/backend/bootstrap/*</exclude>
-              <exclude>src/backend/catalog/aclchk.c</exclude>
-              <exclude>src/backend/catalog/aoseg.c</exclude>
-              <exclude>src/backend/catalog/caql/gram.y</exclude>
-              <exclude>src/backend/catalog/caql/scan.l</exclude>
-              <exclude>src/backend/catalog/catalog.c</exclude>
-              <exclude>src/backend/catalog/dependency.c</exclude>
-              <exclude>src/backend/catalog/genbki.sh</exclude>
-              <exclude>src/backend/catalog/heap.c</exclude>
-              <exclude>src/backend/catalog/index.c</exclude>
-              <exclude>src/backend/catalog/indexing.c</exclude>
-              <exclude>src/backend/catalog/namespace.c</exclude>
-              <exclude>src/backend/catalog/pg_aggregate.c</exclude>
-              <exclude>src/backend/catalog/pg_appendonly.c</exclude>
-              <exclude>src/backend/catalog/pg_attribute_encoding.c</exclude>
-              <exclude>src/backend/catalog/pg_compression.c</exclude>
-              <exclude>src/backend/catalog/pg_constraint.c</exclude>
-              <exclude>src/backend/catalog/pg_conversion.c</exclude>
-              <exclude>src/backend/catalog/pg_depend.c</exclude>
-              <exclude>src/backend/catalog/pg_extprotocol.c</exclude>
-              <exclude>src/backend/catalog/pg_exttable.c</exclude>
-              <exclude>src/backend/catalog/pg_filesystem.c</exclude>
-              <exclude>src/backend/catalog/pg_largeobject.c</exclude>
-              <exclude>src/backend/catalog/pg_namespace.c</exclude>
-              <exclude>src/backend/catalog/pg_operator.c</exclude>
-              <exclude>src/backend/catalog/pg_proc.c</exclude>
-              <exclude>src/backend/catalog/pg_proc_callback.c</exclude>
-              <exclude>src/backend/catalog/pg_shdepend.c</exclude>
-              <exclude>src/backend/catalog/pg_type.c</exclude>
-              <exclude>src/backend/catalog/quicklz_compression.c</exclude>
-              <exclude>src/backend/catalog/toasting.c</exclude>
-              <exclude>src/backend/commands/**/*.c</exclude>
-              <exclude>src/backend/executor/execAmi.c</exclude>
-              <exclude>src/backend/executor/execBitmapAOScan.c</exclude>
-              <exclude>src/backend/executor/execBitmapHeapScan.c</exclude>
-              <exclude>src/backend/executor/execBitmapTableScan.c</exclude>
-              <exclude>src/backend/executor/execGrouping.c</exclude>
-              <exclude>src/backend/executor/execHeapScan.c</exclude>
-              <exclude>src/backend/executor/execHHashagg.c</exclude>
-              <exclude>src/backend/executor/execJunk.c</exclude>
-              <exclude>src/backend/executor/execMain.c</exclude>
-              <exclude>src/backend/executor/execProcnode.c</exclude>
-              <exclude>src/backend/executor/execQual.c</exclude>
-              <exclude>src/backend/executor/execScan.c</exclude>
-              <exclude>src/backend/executor/execTuples.c</exclude>
-              <exclude>src/backend/executor/execUtils.c</exclude>
-              <exclude>src/backend/executor/functions.c</exclude>
-              <exclude>src/backend/executor/instrument.c</exclude>
-              <exclude>src/backend/executor/nodeAgg.c</exclude>
-              <exclude>src/backend/executor/nodeAppend.c</exclude>
-              <exclude>src/backend/executor/nodeAppendOnlyscan.c</exclude>
-              <exclude>src/backend/executor/nodeBitmapAnd.c</exclude>
-              <exclude>src/backend/executor/nodeBitmapAppendOnlyscan.c</exclude>
-              <exclude>src/backend/executor/nodeBitmapHeapscan.c</exclude>
-              <exclude>src/backend/executor/nodeBitmapIndexscan.c</exclude>
-              <exclude>src/backend/executor/nodeBitmapOr.c</exclude>
-              <exclude>src/backend/executor/nodeBitmapTableScan.c</exclude>
-              <exclude>src/backend/executor/nodeFunctionscan.c</exclude>
-              <exclude>src/backend/executor/nodeHash.c</exclude>
-              <exclude>src/backend/executor/nodeHashjoin.c</exclude>
-              <exclude>src/backend/executor/nodeIndexscan.c</exclude>
-              <exclude>src/backend/executor/nodeLimit.c</exclude>
-              <exclude>src/backend/executor/nodeMaterial.c</exclude>
-              <exclude>src/backend/executor/nodeMergejoin.c</exclude>
-              <exclude>src/backend/executor/nodeNestloop.c</exclude>
-              <exclude>src/backend/executor/nodeResult.c</exclude>
-              <exclude>src/backend/executor/nodeSeqscan.c</exclude>
-              <exclude>src/backend/executor/nodeSetOp.c</exclude>
-              <exclude>src/backend/executor/nodeShareInputScan.c</exclude>
-              <exclude>src/backend/executor/nodeSort.c</exclude>
-              <exclude>src/backend/executor/nodeSubplan.c</exclude>
-              <exclude>src/backend/executor/nodeSubqueryscan.c</exclude>
-              <exclude>src/backend/executor/nodeTableFunction.c</exclude>
-              <exclude>src/backend/executor/nodeTidscan.c</exclude>
-              <exclude>src/backend/executor/nodeUnique.c</exclude>
-              <exclude>src/backend/executor/nodeValuesscan.c</exclude>
-              <exclude>src/backend/executor/spi.c</exclude>
-              <exclude>src/backend/executor/test/*</exclude>
-              <exclude>src/backend/executor/tstoreReceiver.c</exclude>
-              <exclude>src/backend/foreign/foreign.c</exclude>
-              <exclude>src/backend/gp_libpq_fe/**/*.c</exclude>
-              <exclude>src/backend/gp_libpq_fe/**/*.h</exclude>
-              <exclude>src/backend/gpopt/library.ver</exclude>
-              <exclude>src/backend/lib/*.c</exclude>
-              <exclude>src/backend/libgppc/lib/Doxyfile</exclude>
-              <exclude>src/backend/libgppc/lib/package/libgppc.spec</exclude>
-              <exclude>src/backend/executor/**/.c</exclude>
-              <exclude>src/backend/libpq/**/*</exclude>
-              <exclude>src/backend/main/main.c</exclude>
-              <exclude>src/backend/nodes/**/*</exclude>
-              <exclude>src/backend/optimizer/**/*</exclude>
-              <exclude>src/backend/parser/*</exclude>
-              <exclude>src/backend/port/**/*</exclude>
-              <exclude>src/backend/postmaster/**/*</exclude>
-              <exclude>src/backend/regex/*</exclude>
-              <exclude>src/backend/rewrite/*.c</exclude>
-              <exclude>src/backend/storage/file/README_QUICKLZ</exclude>
-              <exclude>src/backend/storage/buffer/*.c</exclude>
-              <exclude>src/backend/storage/ipc/*.c</exclude>
-              <exclude>src/backend/storage/file/buffile.c</exclude>
-              <exclude>src/backend/storage/file/fd.c</exclude>
-              <exclude>src/backend/storage/file/filesystem.c</exclude>
-              <exclude>src/backend/storage/file/pipe.c</exclude>
-              <exclude>src/backend/storage/freespace/*.c</exclude>
-              <exclude>src/backend/storage/l*/*.c</exclude>
-              <exclude>src/backend/storage/page/*.c</exclude>
-              <exclude>src/backend/storage/smgr/*.c</exclude>
-              <exclude>src/backend/tcop/**/*.c</exclude>
-              <exclude>src/backend/utils/adt/*</exclude>
-              <exclude>src/backend/utils/cache/**/*</exclude>
-              <exclude>src/backend/utils/error/assert.c</exclude>
-              <exclude>src/backend/utils/error/debugbreak.c</exclude>
-              <exclude>src/backend/utils/error/debugutils.c</exclude>
-              <exclude>src/backend/utils/error/elog.c</exclude>
-              <exclude>src/backend/utils/fmgr/*</exclude>
-              <exclude>src/backend/utils/Gen*</exclude>
-              <exclude>src/backend/utils/gp/*</exclude>
-              <exclude>src/backend/utils/hash/*</exclude>
-              <exclude>src/backend/utils/init/*</exclude>
-              <exclude>src/backend/utils/time/*</exclude>
-              <exclude>src/backend/utils/misc/check_guc</exclude>
-              <exclude>src/backend/utils/misc/etc/gpcheck.cnf</exclude>
-              <exclude>src/backend/utils/misc/etc/slaves</exclude>
-              <exclude>src/backend/utils/misc/guc-file.l</exclude>
-              <exclude>src/backend/utils/misc/guc.c</exclude>
-              <exclude>src/backend/utils/misc/help_config.c</exclude>
-              <exclude>src/backend/utils/misc/pg_rusage.c</exclude>
-              <exclude>src/backend/utils/misc/ps_status.c</exclude>
-              <exclude>src/backend/utils/misc/simex.c</exclude>
-              <exclude>src/backend/utils/misc/superuser.c</exclude>
-              <exclude>src/backend/utils/misc/tzparser.c</exclude>
-              <exclude>src/backend/utils/misc/uriparser.c</exclude>
-              <exclude>src/backend/utils/mmgr/aset.c</exclude>
-              <exclude>src/backend/utils/mmgr/asetDirect.c</exclude>
-              <exclude>src/backend/utils/mmgr/mcxt.c</exclude>
-              <exclude>src/backend/utils/mmgr/portalmem.c</exclude>
-              <exclude>src/backend/utils/probes.d</exclude>
-              <exclude>src/backend/utils/resowner/resowner.c</exclude>
-              <exclude>src/backend/utils/resscheduler/**/*</exclude>
-              <exclude>src/backend/utils/resscheduler/*</exclude>
-              <exclude>src/backend/utils/mb/**/*</exclude>
-              <exclude>src/backend/utils/sort/**/*</exclude>
-              <exclude>src/backend/utils/test/*</exclude>		 
+              <exclude>pxf/**/*.classpath</exclude>	 
               <exclude>src/bin/gp_workfile_mgr/*</exclude>
               <exclude>src/bin/gpfdist/src/gpfdist/glob.c</exclude>
               <exclude>src/bin/pgbench/*</exclude>
@@ -264,244 +99,29 @@
               <exclude>src/bin/psql/**/*</exclude>
               <exclude>src/bin/scripts/*.c</exclude>
               <exclude>src/DEVELOPERS</exclude>
-              <exclude>src/include/c.h</exclude>
-              <exclude>src/include/getaddrinfo.h</exclude>
-              <exclude>src/include/getopt_long.h</exclude>
-              <exclude>src/include/pg_config.h.win32</exclude>
-              <exclude>src/include/port.h</exclude>
-              <exclude>src/include/portability/instr_time.h</exclude>
-              <exclude>src/include/tablefuncapi.h</exclude>
-              <exclude>src/include/access/aosegfiles.h</exclude>
-              <exclude>src/include/access/appendonlytid.h</exclude>
-              <exclude>src/include/access/appendonlywriter.h</exclude>
-              <exclude>src/include/access/attnum.h</exclude>
-              <exclude>src/include/access/bitmap.h</exclude>
-              <exclude>src/include/access/cdbdistributedxidmap.h</exclude>
-              <exclude>src/include/access/clog.h</exclude>
-              <exclude>src/include/access/extprotocol.h</exclude>
-              <exclude>src/include/access/fileam.h</exclude>
-              <exclude>src/include/access/formatter.h</exclude>
-              <exclude>src/include/access/genam.h</exclude>
-              <exclude>src/include/access/gin.h</exclude>
-              <exclude>src/include/access/gist.h</exclude>
-              <exclude>src/include/access/gist_private.h</exclude>
-              <exclude>src/include/access/gistscan.h</exclude>
-              <exclude>src/include/access/ha_config.h</exclude>
-              <exclude>src/include/access/hash.h</exclude>
-              <exclude>src/include/access/hd_work_mgr.h</exclude>
-              <exclude>src/include/access/heapam.h</exclude>
-              <exclude>src/include/access/hio.h</exclude>
-              <exclude>src/include/access/htup.h</exclude>
-              <exclude>src/include/access/itup.h</exclude>
-              <exclude>src/include/access/libchurl.h</exclude>
-              <exclude>src/include/access/memtup.h</exclude>
-              <exclude>src/include/access/multixact.h</exclude>
-              <exclude>src/include/access/nbtree.h</exclude>
-              <exclude>src/include/access/parquetmetadata_c++/MetadataInterface.h</exclude>
-              <exclude>src/include/access/persistentendxactrec.h</exclude>
-              <exclude>src/include/access/persistentfilesysobjname.h</exclude>
-              <exclude>src/include/access/printtup.h</exclude>
-              <exclude>src/include/access/pxfanalyze.h</exclude>
-              <exclude>src/include/access/pxfcomutils.h</exclude>
-              <exclude>src/include/access/pxffilters.h</exclude>
-              <exclude>src/include/access/pxfheaders.h</exclude>
-              <exclude>src/include/access/pxfmasterapi.h</exclude>
-              <exclude>src/include/access/pxfuriparser.h</exclude>
-              <exclude>src/include/access/pxfutils.h</exclude>
+              <exclude>src/backend/access/index/caql.files</exclude>
+              <exclude>src/backend/gpopt/library.ver</exclude>
+              <exclude>src/backend/libgppc/lib/Doxyfile</exclude>
+              <exclude>src/backend/libgppc/lib/package/libgppc.spec</exclude>
+              <exclude>src/backend/port/beos/*.c</exclude>
+              <exclude>src/backend/port/tas/*.s</exclude>
+              <exclude>src/backend/regex/re_syntax.n</exclude>
+              <exclude>src/backend/storage/file/README_QUICKLZ</exclude>
+              <exclude>src/backend/utils/mb/conversion_procs/regress_epilogue</exclude>
+              <exclude>src/backend/utils/mb/conversion_procs/regress_prolog</exclude>
+              <exclude>src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT</exclude>
+              <exclude>src/backend/utils/misc/check_guc</exclude>
+              <exclude>src/backend/utils/misc/etc/slaves</exclude>
               <exclude>src/include/access/README.caql_usage</exclude>
-              <exclude>src/include/access/reloptions.h</exclude>
-              <exclude>src/include/access/relscan.h</exclude>
-              <exclude>src/include/access/rmgr.h</exclude>
-              <exclude>src/include/access/sdir.h</exclude>
-              <exclude>src/include/access/skey.h</exclude>
-              <exclude>src/include/access/slru.h</exclude>
-              <exclude>src/include/access/subtrans.h</exclude>
-              <exclude>src/include/access/sysattr.h</exclude>
-              <exclude>src/include/access/transam.h</exclude>
-              <exclude>src/include/access/tupdesc.h</exclude>
-              <exclude>src/include/access/tupmacs.h</exclude>
-              <exclude>src/include/access/tuptoaster.h</exclude>
-              <exclude>src/include/access/twophase.h</exclude>
-              <exclude>src/include/access/twophase_rmgr.h</exclude>
-              <exclude>src/include/access/url.h</exclude>
-              <exclude>src/include/access/valid.h</exclude>
-              <exclude>src/include/access/xact.h</exclude>
-              <exclude>src/include/access/xlog.h</exclude>
-              <exclude>src/include/access/xlog_internal.h</exclude>
-              <exclude>src/include/access/xlogdefs.h</exclude>
-              <exclude>src/include/access/xlogmm.h</exclude>
-              <exclude>src/include/access/xlogutils.h</exclude>
-              <exclude>src/include/bootstrap/bootstrap.h</exclude>
-              <exclude>src/include/catalog/calico.pl</exclude>
-              <exclude>src/include/catalog/caqltrack.pl</exclude>
-              <exclude>src/include/catalog/caqluniqdef.pl</exclude>
-              <exclude>src/include/catalog/pablopcatso.pl</exclude>
-              <exclude>src/include/catalog/catalog.h</exclude>
-              <exclude>src/include/catalog/catullus.pl</exclude>
-              <exclude>src/include/catalog/catversion.h</exclude>
-              <exclude>src/include/catalog/dependency.h</exclude>
-              <exclude>src/include/catalog/duplicate_oids</exclude>
-              <exclude>src/include/catalog/genbki.h</exclude>
-              <exclude>src/include/catalog/heap.h</exclude>
-              <exclude>src/include/catalog/index.h</exclude>
-              <exclude>src/include/catalog/indexing.h</exclude>
-              <exclude>src/include/catalog/namespace.h</exclude>
-              <exclude>src/include/catalog/pg_aggregate.h</exclude>
-              <exclude>src/include/catalog/pg_am.h</exclude>
-              <exclude>src/include/catalog/pg_amop.h</exclude>
-              <exclude>src/include/catalog/pg_amproc.h</exclude>
-              <exclude>src/include/catalog/pg_attrdef.h</exclude>
-              <exclude>src/include/catalog/pg_attribute.h</exclude>
-              <exclude>src/include/catalog/pg_attribute_encoding.h</exclude>
-              <exclude>src/include/catalog/pg_auth_members.h</exclude>
-              <exclude>src/include/catalog/pg_auth_time_constraint.h</exclude>
-              <exclude>src/include/catalog/pg_authid.h</exclude>
-              <exclude>src/include/catalog/pg_autovacuum.h</exclude>
-              <exclude>src/include/catalog/pg_cast.h</exclude>
-              <exclude>src/include/catalog/pg_class.h</exclude>
-              <exclude>src/include/catalog/pg_compression.h</exclude>
-              <exclude>src/include/catalog/pg_constraint.h</exclude>
-              <exclude>src/include/catalog/pg_control.h</exclude>
-              <exclude>src/include/catalog/pg_conversion.h</exclude>
-              <exclude>src/include/catalog/pg_database.h</exclude>
-              <exclude>src/include/catalog/pg_depend.h</exclude>
-              <exclude>src/include/catalog/pg_description.h</exclude>
-              <exclude>src/include/catalog/pg_exttable.h</exclude>
-              <exclude>src/include/catalog/pg_filespace.h</exclude>
-              <exclude>src/include/catalog/pg_filespace_entry.h</exclude>
-              <exclude>src/include/catalog/pg_filesystem.h</exclude>
-              <exclude>src/include/catalog/pg_foreign_data_wrapper.h</exclude>
-              <exclude>src/include/catalog/pg_foreign_server.h</exclude>
-              <exclude>src/include/catalog/pg_foreign_table.h</exclude>
-              <exclude>src/include/catalog/pg_index.h</exclude>
-              <exclude>src/include/catalog/pg_inherits.h</exclude>
-              <exclude>src/include/catalog/pg_language.h</exclude>
-              <exclude>src/include/catalog/pg_largeobject.h</exclude>
-              <exclude>src/include/catalog/pg_listener.h</exclude>
-              <exclude>src/include/catalog/pg_namespace.h</exclude>
-              <exclude>src/include/catalog/pg_opclass.h</exclude>
-              <exclude>src/include/catalog/pg_operator.h</exclude>
-              <exclude>src/include/catalog/pg_partition_encoding.h</exclude>
-              <exclude>src/include/catalog/pg_pltemplate.h</exclude>
-              <exclude>src/include/catalog/pg_proc.h</exclude>
-              <exclude>src/include/catalog/pg_proc_callback.h</exclude>
-              <exclude>src/include/catalog/pg_remote_credentials.h</exclude>
-              <exclude>src/include/catalog/pg_resqueue.h</exclude>
-              <exclude>src/include/catalog/pg_rewrite.h</exclude>
-              <exclude>src/include/catalog/pg_shdepend.h</exclude>
-              <exclude>src/include/catalog/pg_shdescription.h</exclude>
-              <exclude>src/include/catalog/pg_statistic.h</exclude>
-              <exclude>src/include/catalog/pg_tablespace.h</exclude>
-              <exclude>src/include/catalog/pg_tidycat.h</exclude>
-              <exclude>src/include/catalog/pg_trigger.h</exclude>
-              <exclude>src/include/catalog/pg_type.h</exclude>
-              <exclude>src/include/catalog/pg_type_encoding.h</exclude>
-              <exclude>src/include/catalog/pg_user_mapping.h</exclude>
-              <exclude>src/include/catalog/pg_window.h</exclude>
               <exclude>src/include/catalog/README.add_catalog_function</exclude>
               <exclude>src/include/catalog/README.tidycat</exclude>
-              <exclude>src/include/catalog/sleazy.pl</exclude>
-              <exclude>src/include/catalog/tidycat.pl</exclude>
-              <exclude>src/include/catalog/toasting.h</exclude>
-              <exclude>src/include/catalog/unused_oids</exclude>
-              <exclude>src/include/cdb/cdbappendonlyam.h</exclude>
-              <exclude>src/include/cdb/cdbgroup.h</exclude>
-              <exclude>src/include/cdb/cdblink.h</exclude>
-              <exclude>src/include/commands/alter.h</exclude>
-              <exclude>src/include/commands/analyzeutils.h</exclude>
-              <exclude>src/include/commands/async.h</exclude>
-              <exclude>src/include/commands/cluster.h</exclude>
-              <exclude>src/include/commands/comment.h</exclude>
-              <exclude>src/include/commands/conversioncmds.h</exclude>
-              <exclude>src/include/commands/copy.h</exclude>
-              <exclude>src/include/commands/dbcommands.h</exclude>
-              <exclude>src/include/commands/defrem.h</exclude>
-              <exclude>src/include/commands/explain.h</exclude>
-              <exclude>src/include/commands/extprotocolcmds.h</exclude>
-              <exclude>src/include/commands/filesystemcmds.h</exclude>
-              <exclude>src/include/commands/lockcmds.h</exclude>
-              <exclude>src/include/commands/portalcmds.h</exclude>
-              <exclude>src/include/commands/prepare.h</exclude>
-              <exclude>src/include/commands/proclang.h</exclude>
-              <exclude>src/include/commands/queue.h</exclude>
-              <exclude>src/include/commands/schemacmds.h</exclude>
-              <exclude>src/include/commands/sequence.h</exclude>
-              <exclude>src/include/commands/tablecmds.h</exclude>
-              <exclude>src/include/commands/tablespace.h</exclude>
-              <exclude>src/include/commands/trigger.h</exclude>
-              <exclude>src/include/commands/typecmds.h</exclude>
-              <exclude>src/include/commands/user.h</exclude>
-              <exclude>src/include/commands/vacuum.h</exclude>
-              <exclude>src/include/commands/variable.h</exclude>
-              <exclude>src/include/commands/version.h</exclude>
-              <exclude>src/include/commands/view.h</exclude>
-              <exclude>src/include/executor/execdebug.h</exclude>
-              <exclude>src/include/executor/execdefs.h</exclude>
-              <exclude>src/include/executor/execdesc.h</exclude>
-              <exclude>src/include/executor/execHHashagg.h</exclude>
-              <exclude>src/include/executor/executor.h</exclude>
-              <exclude>src/include/executor/functions.h</exclude>
-              <exclude>src/include/executor/hashjoin.h</exclude>
-              <exclude>src/include/executor/instrument.h</exclude>
-              <exclude>src/include/executor/nodeAgg.h</exclude>
-              <exclude>src/include/executor/nodeAppend.h</exclude>
-              <exclude>src/include/executor/nodeAppendOnlyscan.h</exclude>
-              <exclude>src/include/executor/nodeBitmapAnd.h</exclude>
-              <exclude>src/include/executor/nodeBitmapAppendOnlyscan.h</exclude>
-              <exclude>src/include/executor/nodeBitmapHeapscan.h</exclude>
-              <exclude>src/include/executor/nodeBitmapIndexscan.h</exclude>
-              <exclude>src/include/executor/nodeBitmapOr.h</exclude>
-              <exclude>src/include/executor/nodeBitmapTableScan.h</exclude>
-              <exclude>src/include/executor/nodeFunctionscan.h</exclude>
-              <exclude>src/include/executor/nodeHash.h</exclude>
-              <exclude>src/include/executor/nodeHashjoin.h</exclude>
-              <exclude>src/include/executor/nodeIndexscan.h</exclude>
-              <exclude>src/include/executor/nodeLimit.h</exclude>
-              <exclude>src/include/executor/nodeMaterial.h</exclude>
-              <exclude>src/include/executor/nodeMergejoin.h</exclude>
-              <exclude>src/include/executor/nodeMotion.h</exclude>
-              <exclude>src/include/executor/nodeNestloop.h</exclude>
-              <exclude>src/include/executor/nodeResult.h</exclude>
-              <exclude>src/include/executor/nodeSeqscan.h</exclude>
-              <exclude>src/include/executor/nodeSetOp.h</exclude>
-              <exclude>src/include/executor/nodeShareInputScan.h</exclude>
-              <exclude>src/include/executor/nodeSort.h</exclude>
-              <exclude>src/include/executor/nodeSubplan.h</exclude>
-              <exclude>src/include/executor/nodeSubqueryscan.h</exclude>
-              <exclude>src/include/executor/nodeTidscan.h</exclude>
-              <exclude>src/include/executor/nodeUnique.h</exclude>
-              <exclude>src/include/executor/nodeValuesscan.h</exclude>
-              <exclude>src/include/executor/spi.h</exclude>
-              <exclude>src/include/executor/spi_priv.h</exclude>
-              <exclude>src/include/executor/tstoreReceiver.h</exclude>
-              <exclude>src/include/executor/tuptable.h</exclude>
-              <exclude>src/include/fmgr.h</exclude>
-              <exclude>src/include/foreign/foreign.h</exclude>
-              <exclude>src/include/fstream/*.h</exclude>
-              <exclude>src/include/funcapi.h</exclude>
-              <exclude>src/include/lib/*.h</exclude>
-              <exclude>src/include/libpq/*.h</exclude>
-              <exclude>src/include/mb/pg_wchar.h</exclude>
-              <exclude>src/include/miscadmin.h</exclude>		
-              <exclude>src/include/nodes/*.h</exclude>
-              <exclude>src/include/optimizer/*.h</exclude>
-              <exclude>src/include/parser/*.h</exclude>
-              <exclude>src/include/parser/*.py</exclude>
-              <exclude>src/include/port/**/*.h</exclude>
-              <exclude>src/include/pg*.h</exclude>
-              <exclude>src/include/postgres*.h</exclude>
-              <exclude>src/include/postmaster/*.h</exclude>
-              <exclude>src/include/regex/*.h</exclude>
-              <exclude>src/include/rewrite/*.h</exclude>
-              <exclude>src/include/rusagestub.h</exclude>
-              <exclude>src/include/storage/*.h</exclude>
-              <exclude>src/include/tcop/*.h</exclude>
-              <exclude>src/include/utils/*.h</exclude>
+              <exclude>src/include/pg_config.h.win32</exclude>
               <exclude>src/interfaces/**/*</exclude>
               <exclude>src/tools/**/*</exclude>
               <exclude>src/tutorial/*</exclude>
               <exclude>src/pl/**/*</exclude>
               <exclude>src/port/*</exclude>
+              <exclude>src/**/Makefile*</exclude>
               <exclude>src/template/*</exclude>
               <exclude>src/test/**/*</exclude>
               <exclude>src/timezone/**/*</exclude>
@@ -513,6 +133,24 @@
               <exclude>tools/bin/postgresql_conf_gp_additions</exclude>
               <exclude>tools/doc/**/*</exclude>
             </excludes>
+            <licenses>
+              <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                <licenseFamilyName>PostgreSQL License</licenseFamilyName>
+                <licenseFamilyCategory>PGSQL</licenseFamilyCategory>
+                <patterns>
+                  <pattern>$PostgreSQL:</pattern>
+                  <pattern>PostgreSQL Global Development Group</pattern>
+                </patterns>
+            </license>
+            </licenses>
+            <licenseFamilies>
+              <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                <familyName>PostgreSQL License</familyName>
+              </licenseFamily>
+              <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                <familyName>Apache License Version 2.0</familyName>
+              </licenseFamily>
+            </licenseFamilies>
           </configuration>
         </plugin>
       </plugins>
diff --git a/src/backend/access/common/test/tupdesc_test.c b/src/backend/access/common/test/tupdesc_test.c
index 7e1f104e06..5d38621d62 100644
--- a/src/backend/access/common/test/tupdesc_test.c
+++ b/src/backend/access/common/test/tupdesc_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/access/external/url.i b/src/backend/access/external/url.i
index d2b4816d50..6b0eb9bff4 100755
--- a/src/backend/access/external/url.i
+++ b/src/backend/access/external/url.i
@@ -1,5 +1,20 @@
 /*
- * Portions Copyright (c) 2007-2008, Greenplum inc
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "postgres.h"
diff --git a/src/backend/access/transam/gp_distributed_log.c b/src/backend/access/transam/gp_distributed_log.c
index 8e21bc954f..7273d84a7d 100644
--- a/src/backend/access/transam/gp_distributed_log.c
+++ b/src/backend/access/transam/gp_distributed_log.c
@@ -1,10 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * gp_distributed_log.c
  *		Set-returning function to view gp_distributed_log table.
  *
- * IDENTIFICATION
- *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
diff --git a/src/backend/access/transam/gp_transaction_log.c b/src/backend/access/transam/gp_transaction_log.c
index 83b4afd092..e4dc28db78 100644
--- a/src/backend/access/transam/gp_transaction_log.c
+++ b/src/backend/access/transam/gp_transaction_log.c
@@ -1,10 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * gp_transaction_log.c
  *		Set-returning function to view gp_transaction_log table.
  *
- * IDENTIFICATION
- *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
diff --git a/src/backend/access/transam/test/xact_test.c b/src/backend/access/transam/test/xact_test.c
index 2d85f039a7..6fd47c53a1 100644
--- a/src/backend/access/transam/test/xact_test.c
+++ b/src/backend/access/transam/test/xact_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/catalog/caql/gram.y b/src/backend/catalog/caql/gram.y
index 1350f067e8..6d806ac17e 100644
--- a/src/backend/catalog/caql/gram.y
+++ b/src/backend/catalog/caql/gram.y
@@ -1,4 +1,22 @@
 %{
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * gram.y
diff --git a/src/backend/catalog/caql/scan.l b/src/backend/catalog/caql/scan.l
index 273c11f5a2..f609a959d9 100755
--- a/src/backend/catalog/caql/scan.l
+++ b/src/backend/catalog/caql/scan.l
@@ -1,4 +1,22 @@
 %{
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * scan.l
diff --git a/src/backend/commands/test/define_test.c b/src/backend/commands/test/define_test.c
index b2fec5564d..c456e4bd36 100644
--- a/src/backend/commands/test/define_test.c
+++ b/src/backend/commands/test/define_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/executor/test/execAmi_test.c b/src/backend/executor/test/execAmi_test.c
index 9947104ebc..1d22ce1296 100644
--- a/src/backend/executor/test/execAmi_test.c
+++ b/src/backend/executor/test/execAmi_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/executor/test/execHHashagg_test.c b/src/backend/executor/test/execHHashagg_test.c
index 0972ad9c56..a1ef1db279 100644
--- a/src/backend/executor/test/execHHashagg_test.c
+++ b/src/backend/executor/test/execHHashagg_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/executor/test/execWorkfile_test.c b/src/backend/executor/test/execWorkfile_test.c
index 9d95a1fb71..5a279df2b7 100644
--- a/src/backend/executor/test/execWorkfile_test.c
+++ b/src/backend/executor/test/execWorkfile_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/executor/test/nodeShareInputScan_test.c b/src/backend/executor/test/nodeShareInputScan_test.c
index 7bb8b928a2..292def2764 100644
--- a/src/backend/executor/test/nodeShareInputScan_test.c
+++ b/src/backend/executor/test/nodeShareInputScan_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/executor/test/nodeSubplan_test.c b/src/backend/executor/test/nodeSubplan_test.c
index 4786220323..e587767aa1 100644
--- a/src/backend/executor/test/nodeSubplan_test.c
+++ b/src/backend/executor/test/nodeSubplan_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/libpq/test/pqcomm_test.c b/src/backend/libpq/test/pqcomm_test.c
index 291ffe6e3d..c1df46600e 100644
--- a/src/backend/libpq/test/pqcomm_test.c
+++ b/src/backend/libpq/test/pqcomm_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/nodes/stack.c b/src/backend/nodes/stack.c
index 43ff082b13..daa06d5f73 100644
--- a/src/backend/nodes/stack.c
+++ b/src/backend/nodes/stack.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * Stack.h
diff --git a/src/backend/nodes/test/list_test.c b/src/backend/nodes/test/list_test.c
index ee63c78545..ebfae2320c 100644
--- a/src/backend/nodes/test/list_test.c
+++ b/src/backend/nodes/test/list_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/optimizer/plan/test/createplan_test.c b/src/backend/optimizer/plan/test/createplan_test.c
index 4292d00330..4b7af46b45 100644
--- a/src/backend/optimizer/plan/test/createplan_test.c
+++ b/src/backend/optimizer/plan/test/createplan_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/optimizer/plan/transform.c b/src/backend/optimizer/plan/transform.c
index a49b7aadc1..5438524513 100644
--- a/src/backend/optimizer/plan/transform.c
+++ b/src/backend/optimizer/plan/transform.c
@@ -1,9 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * transform.c
  * 	This file contains methods to transform the query tree
  *
- * Portions Copyright (c) 2011, EMC Greenplum
  * Author: Siva Narayanan
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/optimizer/util/walkers.c b/src/backend/optimizer/util/walkers.c
index ac7349d78a..90d58bc663 100644
--- a/src/backend/optimizer/util/walkers.c
+++ b/src/backend/optimizer/util/walkers.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  * walkers.c
  *
diff --git a/src/backend/port/dynloader/sco.c b/src/backend/port/dynloader/sco.c
index 10e91046bf..a7e0eed653 100644
--- a/src/backend/port/dynloader/sco.c
+++ b/src/backend/port/dynloader/sco.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* Dummy file used for nothing at this point
  *
  * see sco.h
diff --git a/src/backend/port/dynloader/sunos4.c b/src/backend/port/dynloader/sunos4.c
index 08dd9746dd..b63c58d0fd 100644
--- a/src/backend/port/dynloader/sunos4.c
+++ b/src/backend/port/dynloader/sunos4.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* Dummy file used for nothing at this point
  *
  * see sunos4.h
diff --git a/src/backend/port/dynloader/svr4.c b/src/backend/port/dynloader/svr4.c
index e0f6b6b49d..60a6f56c6e 100644
--- a/src/backend/port/dynloader/svr4.c
+++ b/src/backend/port/dynloader/svr4.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* Dummy file used for nothing at this point
  *
  * see svr4.h
diff --git a/src/backend/port/dynloader/univel.c b/src/backend/port/dynloader/univel.c
index 98b6d61d30..4dc97386ee 100644
--- a/src/backend/port/dynloader/univel.c
+++ b/src/backend/port/dynloader/univel.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* Dummy file used for nothing at this point
  *
  * see univel.h
diff --git a/src/backend/port/dynloader/unixware.c b/src/backend/port/dynloader/unixware.c
index 0ae1c69dee..111bae8a28 100644
--- a/src/backend/port/dynloader/unixware.c
+++ b/src/backend/port/dynloader/unixware.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* Dummy file used for nothing at this point
  *
  * see unixware.h
diff --git a/src/backend/postmaster/primary_mirror_transition_client.c b/src/backend/postmaster/primary_mirror_transition_client.c
index e16e40e965..7777c5ec9b 100644
--- a/src/backend/postmaster/primary_mirror_transition_client.c
+++ b/src/backend/postmaster/primary_mirror_transition_client.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /**
  * This code is used for clients that need to connect to the postmaster to send a so-called "transition" message
  * Transition messages are special in that they do not require a full database backend to be executed; so they
diff --git a/src/backend/postmaster/sendalert_common.h b/src/backend/postmaster/sendalert_common.h
index e4ec247ecb..9e02c6d3e4 100644
--- a/src/backend/postmaster/sendalert_common.h
+++ b/src/backend/postmaster/sendalert_common.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef SENDALERT_COMMON_H
 #define SENDALERT_COMMON_H
 
diff --git a/src/backend/storage/file/pipe.c b/src/backend/storage/file/pipe.c
index f0c913b716..300a864d0e 100644
--- a/src/backend/storage/file/pipe.c
+++ b/src/backend/storage/file/pipe.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* pipe.c */
 
 #include "postgres.h"
diff --git a/src/backend/tcop/test/postgres_test.c b/src/backend/tcop/test/postgres_test.c
index 8656fb2564..95fae0bce3 100644
--- a/src/backend/tcop/test/postgres_test.c
+++ b/src/backend/tcop/test/postgres_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/utils/adt/matrix.c b/src/backend/utils/adt/matrix.c
index 40c3a49960..111e526aef 100644
--- a/src/backend/utils/adt/matrix.c
+++ b/src/backend/utils/adt/matrix.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include "postgres.h"
 #include "funcapi.h"
 
diff --git a/src/backend/utils/adt/pivot.c b/src/backend/utils/adt/pivot.c
index 7067bf1d75..daade62ca6 100644
--- a/src/backend/utils/adt/pivot.c
+++ b/src/backend/utils/adt/pivot.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include "postgres.h"
 #include "funcapi.h"
 
diff --git a/src/backend/utils/cache/test/inval_test.c b/src/backend/utils/cache/test/inval_test.c
index 4e84296c9e..877e8c0d02 100644
--- a/src/backend/utils/cache/test/inval_test.c
+++ b/src/backend/utils/cache/test/inval_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/utils/hash/crc32c.c b/src/backend/utils/hash/crc32c.c
index 04b643aeac..7c427a8e12 100644
--- a/src/backend/utils/hash/crc32c.c
+++ b/src/backend/utils/hash/crc32c.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  * crc32c.c
  *
diff --git a/src/backend/utils/resscheduler/test/memquota_test.c b/src/backend/utils/resscheduler/test/memquota_test.c
index 37af09ae6f..f56fb29751 100644
--- a/src/backend/utils/resscheduler/test/memquota_test.c
+++ b/src/backend/utils/resscheduler/test/memquota_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c
index 1971220a07..4584af5e3b 100644
--- a/src/backend/utils/sort/logtape.c
+++ b/src/backend/utils/sort/logtape.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * logtape.c
diff --git a/src/backend/utils/sort/test/string_wrapper_test.c b/src/backend/utils/sort/test/string_wrapper_test.c
index 3b81eafd13..477e20de6a 100644
--- a/src/backend/utils/sort/test/string_wrapper_test.c
+++ b/src/backend/utils/sort/test/string_wrapper_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/backend/utils/sort/tuplestorenew.c b/src/backend/utils/sort/tuplestorenew.c
index 3c0ce521e9..df699ffb0b 100644
--- a/src/backend/utils/sort/tuplestorenew.c
+++ b/src/backend/utils/sort/tuplestorenew.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  * tuplestorenew.c
  *		A better tuplestore
diff --git a/src/backend/utils/test/session_state_test.c b/src/backend/utils/test/session_state_test.c
index ff4df67178..045d370baf 100755
--- a/src/backend/utils/test/session_state_test.c
+++ b/src/backend/utils/test/session_state_test.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/src/include/access/aosegfiles.h b/src/include/access/aosegfiles.h
index 6e22b7156d..c8d3d5ac5b 100644
--- a/src/include/access/aosegfiles.h
+++ b/src/include/access/aosegfiles.h
@@ -1,10 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
 *
 * aosegfiles.h
 *	  internal specifications of the pg_aoseg_* Append Only file segment
 *	  list relation.
 *
-* Portions Copyright (c) 2008, Greenplum Inc.
 *-------------------------------------------------------------------------
 */
 #ifndef AOSEGFILES_H
diff --git a/src/include/access/ha_config.h b/src/include/access/ha_config.h
index 8f459372ec..a5a01aeb51 100644
--- a/src/include/access/ha_config.h
+++ b/src/include/access/ha_config.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef _HA_CONFIG_H_
 #define _HA_CONFIG_H_
 
diff --git a/src/include/access/libchurl.h b/src/include/access/libchurl.h
index 936277fefe..5db2a066f7 100644
--- a/src/include/access/libchurl.h
+++ b/src/include/access/libchurl.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef _GPHDFS_LIBCHURL_H_
 #define _GPHDFS_LIBCHURL_H_
 
diff --git a/src/include/access/parquetmetadata_c++/MetadataInterface.h b/src/include/access/parquetmetadata_c++/MetadataInterface.h
index 45dc64db05..92e2c8e1dd 100644
--- a/src/include/access/parquetmetadata_c++/MetadataInterface.h
+++ b/src/include/access/parquetmetadata_c++/MetadataInterface.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  * MetadataInterface.h
  *
diff --git a/src/include/access/pxfcomutils.h b/src/include/access/pxfcomutils.h
index 986754a5c0..7dafcab258 100644
--- a/src/include/access/pxfcomutils.h
+++ b/src/include/access/pxfcomutils.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef _PXF_COMUTILS_H_
 #define _PXF_COMUTILS_H_
 
diff --git a/src/include/access/pxfheaders.h b/src/include/access/pxfheaders.h
index 28b8ae37cd..13853ab355 100644
--- a/src/include/access/pxfheaders.h
+++ b/src/include/access/pxfheaders.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef _PXF_HEADERS_H_
 #define _PXF_HEADERS_H_
 
diff --git a/src/include/access/pxfuriparser.h b/src/include/access/pxfuriparser.h
index 4e239a5b0b..2c63ea5341 100644
--- a/src/include/access/pxfuriparser.h
+++ b/src/include/access/pxfuriparser.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef _PXF_URIPARSER_H_
 #define _PXF_URIPARSER_H_
 
diff --git a/src/include/access/pxfutils.h b/src/include/access/pxfutils.h
index 21f416adf4..ae21c51710 100644
--- a/src/include/access/pxfutils.h
+++ b/src/include/access/pxfutils.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef _PXF_UTILS_H_
 #define _PXF_UTILS_H_
 
diff --git a/src/include/catalog/pg_remote_credentials.h b/src/include/catalog/pg_remote_credentials.h
index 68ad13fc77..7a3b7fb261 100644
--- a/src/include/catalog/pg_remote_credentials.h
+++ b/src/include/catalog/pg_remote_credentials.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef PG_REMOTE_CREDENTIALS_H
 #define PG_REMOTE_CREDENTIALS_H
 
diff --git a/src/include/commands/extprotocolcmds.h b/src/include/commands/extprotocolcmds.h
index 6d683528c6..7559f7cfd4 100644
--- a/src/include/commands/extprotocolcmds.h
+++ b/src/include/commands/extprotocolcmds.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * extprotocolcmds.h
diff --git a/src/include/commands/filesystemcmds.h b/src/include/commands/filesystemcmds.h
index 27874a1c33..c1fa6c3329 100644
--- a/src/include/commands/filesystemcmds.h
+++ b/src/include/commands/filesystemcmds.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * filesystemcmds.h
diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h
index 7f38a8542a..2c355cf900 100644
--- a/src/include/commands/proclang.h
+++ b/src/include/commands/proclang.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * proclang.h
diff --git a/src/include/fstream/fstream.h b/src/include/fstream/fstream.h
index 1fb90fdf3c..11a7b5ef48 100644
--- a/src/include/fstream/fstream.h
+++ b/src/include/fstream/fstream.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef FSTREAM_H
 #define FSTREAM_H
 
diff --git a/src/include/fstream/gfile.h b/src/include/fstream/gfile.h
index 551cce3ea7..b88485c509 100644
--- a/src/include/fstream/gfile.h
+++ b/src/include/fstream/gfile.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef GFILE_H
 #define GFILE_H
 
diff --git a/src/include/libpq/password_hash.h b/src/include/libpq/password_hash.h
index da9b9680c4..d3ddea6362 100644
--- a/src/include/libpq/password_hash.h
+++ b/src/include/libpq/password_hash.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * password_hash.h
diff --git a/src/include/libpq/pg_sha2.h b/src/include/libpq/pg_sha2.h
index 17b7669183..fdcee3cfc6 100644
--- a/src/include/libpq/pg_sha2.h
+++ b/src/include/libpq/pg_sha2.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #define SHA256_PREFIX "sha256"
 
 #define SHA256_PASSWD_LEN strlen(SHA256_PREFIX) + 64
diff --git a/src/include/optimizer/planpartition.h b/src/include/optimizer/planpartition.h
index 0a0f46aa83..2e8972c569 100644
--- a/src/include/optimizer/planpartition.h
+++ b/src/include/optimizer/planpartition.h
@@ -1,9 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * planpartition.h
  *	  Transforms to produce plans that achieve dynamic partition elimination.
  *
- * Portions Copyright (c) 2011-2013, EMC Corporation
  * Author: Siva
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/transform.h b/src/include/optimizer/transform.h
index 8cc6a2bbc4..4c430bfd72 100644
--- a/src/include/optimizer/transform.h
+++ b/src/include/optimizer/transform.h
@@ -1,9 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * transform.h
  * 	Query transformation routines
  *
- * Portions Copyright (c) 2011-2013, EMC Corporation
  * Author: Siva
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/walkers.h b/src/include/optimizer/walkers.h
index 6d51b314fc..c6bb2f7fa3 100644
--- a/src/include/optimizer/walkers.h
+++ b/src/include/optimizer/walkers.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  * walkers.h
  *
diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h
index 8b13789179..042f3ce1f3 100644
--- a/src/include/port/bsdi.h
+++ b/src/include/port/bsdi.h
@@ -1 +1,18 @@
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index b4e975c89d..7d84b96123 100644
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* see src/backend/libpq/pqcomm.c */
 #define SCO_ACCEPT_BUG
 
diff --git a/src/include/port/sunos4.h b/src/include/port/sunos4.h
index f7545fc6fa..361e660736 100644
--- a/src/include/port/sunos4.h
+++ b/src/include/port/sunos4.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* sprintf() returns char *, not int, on SunOS 4.1.x */
 #define SPRINTF_CHAR
 
diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h
index 2c38612c4d..9f072f32cb 100644
--- a/src/include/port/svr4.h
+++ b/src/include/port/svr4.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef			BYTE_ORDER
 #ifdef			MIPSEB
 #define			BYTE_ORDER		BIG_ENDIAN
diff --git a/src/include/port/ultrix4.h b/src/include/port/ultrix4.h
index c199afcbea..cbd9377df6 100644
--- a/src/include/port/ultrix4.h
+++ b/src/include/port/ultrix4.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #define NOFIXADE
 #define NEED_STRDUP
 
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index d94e7f263b..4ad41afe3d 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /***************************************
  * Define this if you are compiling with
  * the native UNIXWARE C compiler.
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index aef4716698..f860581196 100644
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /* see src/backend/libpq/pqcomm.c */
 #define SCO_ACCEPT_BUG
 
diff --git a/src/include/port/win32/sys/mman.h b/src/include/port/win32/sys/mman.h
index a9a837bc4d..7d91f21f60 100644
--- a/src/include/port/win32/sys/mman.h
+++ b/src/include/port/win32/sys/mman.h
@@ -1,7 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef PROT_READ
 #define PROT_READ	0x1		/* Page can be read.  */
 #define PROT_WRITE	0x2		/* Page can be written.  */
 #define PROT_EXEC	0x4		/* Page can be executed.  */
 #define PROT_NONE	0x0		/* Page can not be accessed.  */
 #endif 
-#define mprotect(x,y,z) (false)
\ No newline at end of file
+#define mprotect(x,y,z) (false)
diff --git a/src/include/port/win32/sys/resource.h b/src/include/port/win32/sys/resource.h
index 0519ecba6e..042f3ce1f3 100644
--- a/src/include/port/win32/sys/resource.h
+++ b/src/include/port/win32/sys/resource.h
@@ -1 +1,18 @@
- 
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
diff --git a/src/include/postmaster/sendalert.h b/src/include/postmaster/sendalert.h
index c7aedbdf9f..0f3c42d018 100644
--- a/src/include/postmaster/sendalert.h
+++ b/src/include/postmaster/sendalert.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef _SENDALERT_H
 #define _SENDALERT_H
 
diff --git a/src/include/storage/lockrmgr.h b/src/include/storage/lockrmgr.h
index 8be8049e90..f3214b4d42 100644
--- a/src/include/storage/lockrmgr.h
+++ b/src/include/storage/lockrmgr.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*-------------------------------------------------------------------------
  *
  * lockrmgr.h
diff --git a/src/include/storage/pipe.h b/src/include/storage/pipe.h
index 4bfd34212f..36f6c23c32 100644
--- a/src/include/storage/pipe.h
+++ b/src/include/storage/pipe.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 #ifndef PIPE_H
 #define PIPE_H
 
diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h
index 193fe9aab5..07d53a7cf3 100644
--- a/src/include/utils/cash.h
+++ b/src/include/utils/cash.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  * cash.h
  * Written by D'Arcy J.M. Cain
diff --git a/src/include/utils/segadmin.h b/src/include/utils/segadmin.h
index 6fbd722305..e127eb7698 100644
--- a/src/include/utils/segadmin.h
+++ b/src/include/utils/segadmin.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*--------------------------------------------------------------------
  * segadmin.h
  *
diff --git a/src/include/utils/tuplestorenew.h b/src/include/utils/tuplestorenew.h
index 8c320583e1..85c6f959f1 100644
--- a/src/include/utils/tuplestorenew.h
+++ b/src/include/utils/tuplestorenew.h
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  * tuplestorenew.h
  * 	A better tuple store