--- a/clang/include/clang/Lex/Lexer.h	Fri Jul 28 20:50:09 2023 +0900
+++ b/clang/include/clang/Lex/Lexer.h	Thu Aug 10 15:24:13 2023 +0900
@@ -201,9 +201,6 @@
 private:
   /// Lex - Return the next token in the file.  If this is the end of file, it
   /// return the tok::eof token.  This implicitly involves the preprocessor.
-#ifndef noCbC
-  bool Lex(Token &Result, bool ProtoParsing = false);
-#else
   bool Lex(Token &Result);
 
   /// Called when the preprocessor is in 'dependency scanning lexing mode'.
@@ -222,7 +219,6 @@
   /// \returns the buffer pointer at the beginning of the token.
   const char *convertDependencyDirectiveToken(
       const dependency_directives_scan::Token &DDTok, Token &Result);
-#endif
 
 public:
   /// isPragmaLexer - Returns true if this Lexer is being used to lex a pragma.
@@ -609,11 +605,7 @@
   /// LexTokenInternal - Internal interface to lex a preprocessing token. Called
   /// by Lex.
   ///
-#ifndef noCbC
-  bool LexTokenInternal(Token &Result, bool TokAtPhysicalStartOfLine, bool ignoreInclude = false);
-#else
   bool LexTokenInternal(Token &Result, bool TokAtPhysicalStartOfLine);
-#endif
 
   bool CheckUnicodeWhitespace(Token &Result, uint32_t C, const char *CurPtr);
 

--- a/clang/include/clang/Parse/Parser.h	Fri Jul 28 20:50:09 2023 +0900
+++ b/clang/include/clang/Parse/Parser.h	Thu Aug 10 15:24:13 2023 +0900
@@ -2501,34 +2501,6 @@
 
   bool isDeclarationSpecifier(ImplicitTypenameContext AllowImplicitTypename,
                               bool DisambiguatingWithExpression = false);
-#ifndef noCbC
-  void CreateRetCS(IdentifierInfo* csName);
-  void Create__CbC_envStruct(SourceLocation Loc, AccessSpecifier AS);
-  IdentifierInfo* CreateIdentifierInfo(const char* Name, SourceLocation Loc);
-  IdentifierInfo* CreateAnonIdentifierInfo(const char* Name, SourceLocation Loc);
-  Decl* Create__CbC_envBody(Decl* TagDecl, DeclSpec::TST T, SourceLocation Loc, const char* Name);
-  ExprResult LookupNameAndBuildExpr(IdentifierInfo *II = 0, bool IsAddressOfOperand = false);
-  ExprResult LookupMemberAndBuildExpr(IdentifierInfo *II, Expr* Base, bool IsArrow);
-  StmtResult CreateSjForContinuationWithTheEnv();
-  StmtResult CreateAssignmentStmt(IdentifierInfo* LHSII = 0, IdentifierInfo* RHSII = 0, bool LHSisMemberAccess = false,
-                                  bool RHShasAmp = false, IdentifierInfo* extraLHSII = 0, IdentifierInfo* extraRHSII = 0);
-  StmtResult CreateDeclStmt(IdentifierInfo *II = 0, bool isRetCS = false, bool copyType = false, int array = 0, DeclSpec::TST valueType = DeclSpec::TST_int, IdentifierInfo* Name = 0, DeclSpec::TQ TQ = DeclSpec::TQ_unspecified);
-  IdentifierInfo* CreateUniqueIdentifierInfo(const char* Name, SourceLocation Loc);
-  ParmVarDecl* CreateParam(IdentifierInfo *II = 0, int pointerNum = 0, DeclSpec::TST T = DeclSpec::TST_int);
-  Decl* HandleDeclAndChangeDeclType(Declarator &D);
-  void setTST(DeclSpec *DS = 0, DeclSpec::TST T = DeclSpec::TST_int, IdentifierInfo *Name = 0, DeclSpec::TQ TQ = DeclSpec::TQ_unspecified);
-  void CheckTheSjHeader();
-  ExprResult IIToExpr(IdentifierInfo *II, tok::TokenKind Kind);
-  ExprResult AnonToExpr(IdentifierInfo *II, tok::TokenKind Kind);
-  StmtResult CreateComplexStmtRet(IdentifierInfo *II, bool IsAddressOfOperand);
-  ExprResult Prepare__retForGotoWithTheEnvExpr();
-  ExprResult Prepare__envForGotoWithTheEnvExpr();
-  bool isVoidFunction();
-  bool SearchCodeSegmentDeclaration(std::string Name);
-  void CreatePrototypeDeclaration();
-  bool SkipAnyUntil(tok::TokenKind T, SkipUntilFlags Flags = static_cast<SkipUntilFlags>(0));
-  bool NeedPrototypeDeclaration(Token IITok);
-#endif
 
   bool isTypeSpecifierQualifier();