diff --git a/src/backend/distributed/commands/database.c b/src/backend/distributed/commands/database.c
index 0454122c5..a0972eda1 100644
--- a/src/backend/distributed/commands/database.c
+++ b/src/backend/distributed/commands/database.c
@@ -62,10 +62,16 @@ typedef struct DatabaseCollationInfo
 #endif
 } DatabaseCollationInfo;
 
+static void EnsureSupportedCreateDatabaseCommand(CreatedbStmt *stmt);
+static char * GenerateCreateDatabaseStatementFromPgDatabase(Form_pg_database databaseForm);
+static DatabaseCollationInfo GetDatabaseCollation(Oid dbOid);
 static AlterOwnerStmt * RecreateAlterDatabaseOwnerStmt(Oid databaseOid);
+static char * GetLocaleProviderString(char datlocprovider);
+static char * GetTablespaceName(Oid tablespaceOid);
+static ObjectAddress * GetDatabaseAddressFromDatabaseName(char *databaseName,bool missingOk);
+
 static Oid get_database_owner(Oid db_oid);
-List * PreprocessGrantOnDatabaseStmt(Node *node, const char *queryString,
-									 ProcessUtilityContext processUtilityContext);
+
 
 /* controlled via GUC */
 bool EnableCreateDatabasePropagation = false;
diff --git a/src/backend/distributed/deparser/deparse_database_stmts.c b/src/backend/distributed/deparser/deparse_database_stmts.c
index 5878d7ea8..cd86eedf1 100644
--- a/src/backend/distributed/deparser/deparse_database_stmts.c
+++ b/src/backend/distributed/deparser/deparse_database_stmts.c
@@ -27,8 +27,12 @@
 
 
 static void AppendAlterDatabaseOwnerStmt(StringInfo buf, AlterOwnerStmt *stmt);
+static void AppendAlterDatabaseSetStmt(StringInfo buf, AlterDatabaseSetStmt *stmt);
 static void AppendAlterDatabaseStmt(StringInfo buf, AlterDatabaseStmt *stmt);
 static void AppendDefElemConnLimit(StringInfo buf, DefElem *def);
+static void AppendCreateDatabaseStmt(StringInfo buf, CreatedbStmt *stmt);
+static void AppendDropDatabaseStmt(StringInfo buf, DropdbStmt *stmt);
+static void AppendGrantOnDatabaseStmt(StringInfo buf, GrantStmt *stmt);
 
 const DefElemOptionFormat create_database_option_formats[] = {
 	{ "owner", " OWNER %s", OPTION_FORMAT_STRING },