lfittl@starfish libpg_query % git diff 15-latest:./src/pg_query_deparse.c ./src/postgres_deparse.c
diff --git a/src/pg_query_deparse.c b/src/postgres_deparse.c
index f37e5a0..8687a9d 100644
--- a/src/pg_query_deparse.c
+++ b/src/postgres_deparse.c
@@ -1,7 +1,4 @@
-#include "pg_query.h"
-#include "pg_query_internal.h"
-#include "pg_query_readfuncs.h"
-
+#include "postgres.h"
 #include "catalog/index.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_attribute.h"
@@ -141,7 +138,7 @@ static void deparseSelectStmt(StringInfo str, SelectStmt *stmt);
 static void deparseIntoClause(StringInfo str, IntoClause *into_clause);
 static void deparseRangeVar(StringInfo str, RangeVar *range_var, DeparseNodeContext context);
 static void deparseResTarget(StringInfo str, ResTarget *res_target, DeparseNodeContext context);
-static void deparseRawStmt(StringInfo str, RawStmt *raw_stmt);
+void deparseRawStmt(StringInfo str, RawStmt *raw_stmt);
 static void deparseAlias(StringInfo str, Alias *alias);
 static void deparseWindowDef(StringInfo str, WindowDef* window_def);
 static void deparseColumnRef(StringInfo str, ColumnRef* column_ref);
@@ -2380,11 +2377,11 @@ static void deparseRangeVar(StringInfo str, RangeVar *range_var, DeparseNodeCont
        removeTrailingSpace(str);
 }
 
-static void deparseRawStmt(StringInfo str, RawStmt *raw_stmt)
+void deparseRawStmt(StringInfo str, RawStmt *raw_stmt)
 {
        if (raw_stmt->stmt == NULL)
                elog(ERROR, "deparse error in deparseRawStmt: RawStmt with empty Stmt");
-       
+
        deparseStmt(str, raw_stmt->stmt);
 }
 
@@ -10648,62 +10645,3 @@ static void deparseStmt(StringInfo str, Node *node)
                        elog(ERROR, "deparse: unsupported top-level node type: %u", nodeTag(node));
        }
 }
-
-PgQueryDeparseResult pg_query_deparse_protobuf(PgQueryProtobuf parse_tree)
-{
-       PgQueryDeparseResult result = {0};
-       StringInfoData str;
-       MemoryContext ctx;
-       List *stmts;
-       ListCell *lc;
-
-       ctx = pg_query_enter_memory_context();
-
-       PG_TRY();
-       {
-               stmts = pg_query_protobuf_to_nodes(parse_tree);
-
-               initStringInfo(&str);
-
-               foreach(lc, stmts) {
-                       deparseRawStmt(&str, castNode(RawStmt, lfirst(lc)));
-                       if (lnext(stmts, lc))
-                               appendStringInfoString(&str, "; ");
-               }
-               result.query = strdup(str.data);
-       }
-       PG_CATCH();
-       {
-               ErrorData* error_data;
-               PgQueryError* error;
-
-               MemoryContextSwitchTo(ctx);
-               error_data = CopyErrorData();
-
-               // Note: This is intentionally malloc so exiting the memory context doesn't free this
-               error = malloc(sizeof(PgQueryError));
-               error->message   = strdup(error_data->message);
-               error->filename  = strdup(error_data->filename);
-               error->funcname  = strdup(error_data->funcname);
-               error->context   = NULL;
-               error->lineno   = error_data->lineno;
-               error->cursorpos = error_data->cursorpos;
-
-               result.error = error;
-               FlushErrorState();
-       }
-       PG_END_TRY();
-
-       pg_query_exit_memory_context(ctx);
-
-       return result;
-}
-
-void pg_query_free_deparse_result(PgQueryDeparseResult result)
-{
-       if (result.error) {
-               pg_query_free_error(result.error);
-       }
-
-       free(result.query);
-}