cel-expr · copybara-service · Jun 19, 2026
diff --git a/cel-c/BUILD b/cel-c/BUILD
@@ -55,8 +55,8 @@ cc_library(
     deps = [
         ":assert",
         ":config",
-        "//cel-c/src:ckdint",
-        "//cel-c/src:malloc",
+        "//cel-c/internal:ckdint",
+        "//cel-c/internal:malloc",
         "@protobuf//upb/mem",
     ],
 )
@@ -67,7 +67,7 @@ cc_test(
     deps = [
         ":alloc",
         ":config",
-        "//cel-c/src:align",
+        "//cel-c/internal:align",
         "@googletest//:gtest_main",
     ],
 )
@@ -85,8 +85,8 @@ cc_library(
         ":alloc",
         ":assert",
         ":config",
-        "//cel-c/src:align",
-        "//cel-c/src:ckdint",
+        "//cel-c/internal:align",
+        "//cel-c/internal:ckdint",
         "@protobuf//upb/base",
         "@protobuf//upb/mem",
     ],
@@ -184,8 +184,8 @@ cc_library(
         ":string_view",
         ":type",
         ":type_proto",
-        "//cel-c/src:malloc",
-        "//cel-c/src:setjmp",
+        "//cel-c/internal:malloc",
+        "//cel-c/internal:setjmp",
         "@cel-spec//proto/cel/expr:checked_upb_proto",
         "@cel-spec//proto/cel/expr:syntax_upb_proto",
         "@protobuf//upb/mem",
@@ -240,8 +240,8 @@ cc_library(
         ":string_view",
         ":type",
         ":type_proto_v1alpha1",
-        "//cel-c/src:malloc",
-        "//cel-c/src:setjmp",
+        "//cel-c/internal:malloc",
+        "//cel-c/internal:setjmp",
         "@googleapis//google/api/expr/v1alpha1:checked_upb_proto",
         "@protobuf//upb/mem",
     ],
@@ -290,8 +290,8 @@ cc_library(
         ":config",
         ":status",
         ":string_view",
-        "//cel-c/src:deque",
-        "//cel-c/src:malloc",
+        "//cel-c/internal:deque",
+        "//cel-c/internal:malloc",
     ],
 )
 
@@ -617,7 +617,7 @@ cc_library(
     deps = [
         ":assert",
         ":config",
-        "//cel-c/src:ckdint",
+        "//cel-c/internal:ckdint",
     ],
 )
 
@@ -956,10 +956,10 @@ cc_library(
     deps = [
         ":assert",
         ":config",
-        "//cel-c/src:bit",
-        "//cel-c/src:config",
-        "//cel-c/src:uint128",
-        "//cel-c/src:unaligned",
+        "//cel-c/internal:bit",
+        "//cel-c/internal:config",
+        "//cel-c/internal:uint128",
+        "//cel-c/internal:unaligned",
         "@protobuf//upb/base",
     ],
 )
@@ -1049,7 +1049,7 @@ cc_library(
         ":type",
         ":value",
         ":well_known_types",
-        "//cel-c/src/runtime",  # buildcleaner: keep
+        "//cel-c/internal/runtime",  # buildcleaner: keep
         "@protobuf//upb/reflection",
     ],
 )
@@ -1184,8 +1184,8 @@ cc_library(
         ":error_space",
         ":status_code",
         ":string_view",
-        "//cel-c/src:array",
-        "//cel-c/src:string",
+        "//cel-c/internal:array",
+        "//cel-c/internal:string",
     ],
 )
 
@@ -1363,7 +1363,7 @@ cc_library(
         ":config",
         ":cstring_view",
         ":hash",
-        "//cel-c/src:memory",
+        "//cel-c/internal:memory",
         "@protobuf//upb/base",
     ],
 )
@@ -1414,7 +1414,7 @@ cc_library(
         ":assert",
         ":config",
         ":duration",
-        "//cel-c/src:ckdint",
+        "//cel-c/internal:ckdint",
     ],
 )
 
@@ -1663,7 +1663,7 @@ cc_library(
         ":timestamp",
         ":value_kind",
         ":well_known_types",
-        "//cel-c/src:value",  # buildcleaner: keep
+        "//cel-c/internal:value",  # buildcleaner: keep
         "@protobuf//upb/message",
         "@protobuf//upb/reflection",
     ],

diff --git a/cel-c/alloc.cc b/cel-c/alloc.cc
@@ -22,8 +22,8 @@
 
 #include "cel-c/assert.h"
 #include "cel-c/config.h"
-#include "cel-c/src/ckdint.h"
-#include "cel-c/src/malloc.h"
+#include "cel-c/internal/ckdint.h"
+#include "cel-c/internal/malloc.h"
 #include "upb/mem/alloc.h"
 
 extern "C" CEL_NULLABLE(void*)

diff --git a/cel-c/alloc_test.cc b/cel-c/alloc_test.cc
@@ -20,7 +20,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "cel-c/config.h"
-#include "cel-c/src/align.h"
+#include "cel-c/internal/align.h"
 
 namespace {
 

diff --git a/cel-c/arena.cc b/cel-c/arena.cc
@@ -22,8 +22,8 @@
 
 #include "cel-c/assert.h"
 #include "cel-c/config.h"
-#include "cel-c/src/align.h"
-#include "cel-c/src/ckdint.h"
+#include "cel-c/internal/align.h"
+#include "cel-c/internal/ckdint.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 

diff --git a/cel-c/ast_proto.cc b/cel-c/ast_proto.cc
@@ -26,11 +26,11 @@
 #include "cel-c/ast.h"
 #include "cel-c/config.h"
 #include "cel-c/constant_proto.h"
+#include "cel-c/internal/malloc.h"
+#include "cel-c/internal/setjmp.h"
 #include "cel-c/operators.h"
 #include "cel-c/ref.h"
 #include "cel-c/ref_proto.h"
-#include "cel-c/src/malloc.h"
-#include "cel-c/src/setjmp.h"
 #include "cel-c/status.h"
 #include "cel-c/string_view.h"
 #include "cel-c/type.h"

diff --git a/cel-c/ast_proto_v1alpha1.cc b/cel-c/ast_proto_v1alpha1.cc
@@ -26,11 +26,11 @@
 #include "cel-c/ast.h"
 #include "cel-c/config.h"
 #include "cel-c/constant_proto_v1alpha1.h"
+#include "cel-c/internal/malloc.h"
+#include "cel-c/internal/setjmp.h"
 #include "cel-c/operators.h"
 #include "cel-c/ref.h"
 #include "cel-c/ref_proto_v1alpha1.h"
-#include "cel-c/src/malloc.h"
-#include "cel-c/src/setjmp.h"
 #include "cel-c/status.h"
 #include "cel-c/string_view.h"
 #include "cel-c/type.h"

diff --git a/cel-c/ast_traverse.cc b/cel-c/ast_traverse.cc
@@ -23,8 +23,8 @@
 #include "cel-c/ast.h"
 #include "cel-c/ast_visitor.h"
 #include "cel-c/config.h"
-#include "cel-c/src/deque.h"
-#include "cel-c/src/malloc.h"
+#include "cel-c/internal/deque.h"
+#include "cel-c/internal/malloc.h"
 #include "cel-c/status.h"
 #include "cel-c/string_view.h"
 

diff --git a/cel-c/duration.cc b/cel-c/duration.cc
@@ -19,7 +19,7 @@
 
 #include "cel-c/assert.h"
 #include "cel-c/config.h"
-#include "cel-c/src/ckdint.h"
+#include "cel-c/internal/ckdint.h"
 
 extern "C" bool cel_Duration_Normalize(int64_t* cel_nonnull sec,
                                        int32_t* cel_nonnull nsec) {

diff --git a/cel-c/hash.cc b/cel-c/hash.cc
@@ -19,10 +19,10 @@
 #include <stdint.h>
 
 #include "cel-c/assert.h"
-#include "cel-c/src/bit.h"
-#include "cel-c/src/config.h"
-#include "cel-c/src/uint128.h"
-#include "cel-c/src/unaligned.h"
+#include "cel-c/internal/bit.h"
+#include "cel-c/internal/config.h"
+#include "cel-c/internal/uint128.h"
+#include "cel-c/internal/unaligned.h"
 
 static CEL_NONNULL(const void*) const _cel_kHashSeed = &_cel_kHashSeed;
 

diff --git a/cel-c/src/BUILD → cel-c/internal/BUILD b/cel-c/src/BUILD → cel-c/internal/BUILD
@@ -750,10 +750,10 @@ cc_test(
         "//cel-c:timestamp",
         "//cel-c:trilean",
         "//cel-c:value",
-        "//cel-c/src/runtime",
-        "//cel-c/src/testing:compiler",
-        "//cel-c/src/testing:def_pool",
-        "//cel-c/src/testing:parser",
+        "//cel-c/internal/runtime",
+        "//cel-c/internal/testing:compiler",
+        "//cel-c/internal/testing:def_pool",
+        "//cel-c/internal/testing:parser",
         "@abseil-cpp//absl/cleanup",
         "@abseil-cpp//absl/container:flat_hash_map",
         "@abseil-cpp//absl/log:absl_check",

diff --git a/cel-c/src/align.h → cel-c/internal/align.h b/cel-c/src/align.h → cel-c/internal/align.h
@@ -15,8 +15,8 @@
 // Internal header providing address alignment functions. Uses compiler
 // intrinsics if available, otherwise falls back to a pure implementation.
 
-#ifndef THIRD_PARTY_CEL_C_SRC_ALIGN_H_
-#define THIRD_PARTY_CEL_C_SRC_ALIGN_H_
+#ifndef THIRD_PARTY_CEL_C_INTERNAL_ALIGN_H_
+#define THIRD_PARTY_CEL_C_INTERNAL_ALIGN_H_
 
 #include <limits.h>
 #include <stdbool.h>  // IWYU pragma: keep
@@ -25,7 +25,7 @@
 
 #include "cel-c/assert.h"
 #include "cel-c/config.h"
-#include "cel-c/src/bit.h"
+#include "cel-c/internal/bit.h"
 
 // NOLINTBEGIN(runtime/int)
 // NOLINTBEGIN(google-runtime-int)
@@ -531,4 +531,4 @@ CEL_END_DECLS
 // NOLINTEND(google-runtime-int)
 // NOLINTEND(runtime/int)
 
-#endif  // THIRD_PARTY_CEL_C_SRC_ALIGN_H_
+#endif  // THIRD_PARTY_CEL_C_INTERNAL_ALIGN_H_
diff --git a/cel-c/src/align_test.cc → cel-c/internal/align_test.cc b/cel-c/src/align_test.cc → cel-c/internal/align_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cel-c/src/align.h"
+#include "cel-c/internal/align.h"
 
 #include <cstddef>
 

diff --git a/cel-c/src/alloca.h → cel-c/internal/alloca.h b/cel-c/src/alloca.h → cel-c/internal/alloca.h
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef THIRD_PARTY_CEL_C_SRC_ALLOCA_H_
-#define THIRD_PARTY_CEL_C_SRC_ALLOCA_H_
+#ifndef THIRD_PARTY_CEL_C_INTERNAL_ALLOCA_H_
+#define THIRD_PARTY_CEL_C_INTERNAL_ALLOCA_H_
 
-#include "cel-c/src/config.h"
+#include "cel-c/internal/config.h"
 
 #ifdef _WIN32
 #include <malloc.h>
@@ -28,4 +28,4 @@
 
 #define _cel_alloca(size) alloca(size)
 
-#endif  // THIRD_PARTY_CEL_C_SRC_ALLOCA_H_
+#endif  // THIRD_PARTY_CEL_C_INTERNAL_ALLOCA_H_
diff --git a/cel-c/src/any.cc → cel-c/internal/any.cc b/cel-c/src/any.cc → cel-c/internal/any.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cel-c/src/any.h"
+#include "cel-c/internal/any.h"
 
 #include <stdbool.h>
 #include <string.h>

diff --git a/cel-c/src/any.h → cel-c/internal/any.h b/cel-c/src/any.h → cel-c/internal/any.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef THIRD_PARTY_CEL_C_SRC_ANY_H_
-#define THIRD_PARTY_CEL_C_SRC_ANY_H_
+#ifndef THIRD_PARTY_CEL_C_INTERNAL_ANY_H_
+#define THIRD_PARTY_CEL_C_INTERNAL_ANY_H_
 
 #include <stdbool.h>
 
@@ -68,4 +68,4 @@ _cel_AnyUnpackResult_ToMessage(_cel_AnyUnpackResult result);
 
 CEL_END_DECLS
 
-#endif  // THIRD_PARTY_CEL_C_SRC_ANY_H_
+#endif  // THIRD_PARTY_CEL_C_INTERNAL_ANY_H_
diff --git a/cel-c/src/any_test.cc → cel-c/internal/any_test.cc b/cel-c/src/any_test.cc → cel-c/internal/any_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cel-c/src/any.h"
+#include "cel-c/internal/any.h"
 
 #include <string>
 

diff --git a/cel-c/src/arc.h → cel-c/internal/arc.h b/cel-c/src/arc.h → cel-c/internal/arc.h
@@ -18,8 +18,8 @@
 // toolchains that occur when mixing `<atomic>` and `<stdatomic.h>`. Instead we
 // use compiler intrinsics across the board.
 
-#ifndef THIRD_PARTY_CEL_C_SRC_ARC_H_
-#define THIRD_PARTY_CEL_C_SRC_ARC_H_
+#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARC_H_
+#define THIRD_PARTY_CEL_C_INTERNAL_ARC_H_
 
 #include <limits.h>
 #include <stdbool.h>  // IWYU pragma: keep
@@ -135,4 +135,4 @@ CEL_END_DECLS
 // NOLINTEND(google-runtime-int)
 // NOLINTEND(runtime/int)
 
-#endif  // THIRD_PARTY_CEL_C_SRC_ARC_H_
+#endif  // THIRD_PARTY_CEL_C_INTERNAL_ARC_H_
diff --git a/cel-c/src/arc_test.cc → cel-c/internal/arc_test.cc b/cel-c/src/arc_test.cc → cel-c/internal/arc_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cel-c/src/arc.h"
+#include "cel-c/internal/arc.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

diff --git a/cel-c/src/arena_array.h → cel-c/internal/arena_array.h b/cel-c/src/arena_array.h → cel-c/internal/arena_array.h
@@ -15,16 +15,16 @@
 // Internal header providing a dynamic array implementation which uses
 // arena-based memory management.
 
-#ifndef THIRD_PARTY_CEL_C_SRC_ARENA_ARRAY_H_
-#define THIRD_PARTY_CEL_C_SRC_ARENA_ARRAY_H_
+#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARENA_ARRAY_H_
+#define THIRD_PARTY_CEL_C_INTERNAL_ARENA_ARRAY_H_
 
 #include <stdalign.h>  // IWYU pragma: keep
 #include <stdbool.h>   // IWYU pragma: keep
 #include <stddef.h>
 
 #include "cel-c/arena.h"
 #include "cel-c/config.h"
-#include "cel-c/src/generic_array.h"
+#include "cel-c/internal/generic_array.h"
 
 CEL_BEGIN_DECLS
 
@@ -376,4 +376,4 @@ static CEL_INLINE CEL_NULLABLE(void*)
 
 CEL_END_DECLS
 
-#endif  // THIRD_PARTY_CEL_C_SRC_ARENA_ARRAY_H_
+#endif  // THIRD_PARTY_CEL_C_INTERNAL_ARENA_ARRAY_H_
diff --git a/cel-c/src/arena_array_test.cc → cel-c/internal/arena_array_test.cc b/cel-c/src/arena_array_test.cc → cel-c/internal/arena_array_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cel-c/src/arena_array.h"
+#include "cel-c/internal/arena_array.h"
 
 #include <cstddef>