diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bb07a03d..3d4ecc810 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,6 @@ endif()
 add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$<BOOL:${FLATBUFFERS_LOCALE_INDEPENDENT}>)
 
 set(FlatBuffers_Library_SRCS
-  include/flatbuffers/code_generators.h
   include/flatbuffers/base.h
   include/flatbuffers/flatbuffers.h
   include/flatbuffers/hash.h
@@ -80,7 +79,6 @@ set(FlatBuffers_Library_SRCS
   include/flatbuffers/flexbuffers.h
   include/flatbuffers/registry.h
   include/flatbuffers/minireflect.h
-  src/code_generators.cpp
   src/idl_parser.cpp
   src/idl_gen_text.cpp
   src/reflection.cpp
@@ -106,6 +104,8 @@ set(FlatBuffers_Compiler_SRCS
   src/idl_gen_json_schema.cpp
   src/flatc.cpp
   src/flatc_main.cpp
+  include/flatbuffers/code_generators.h
+  src/code_generators.cpp
   grpc/src/compiler/schema_interface.h
   grpc/src/compiler/cpp_generator.h
   grpc/src/compiler/cpp_generator.cc
@@ -133,6 +133,8 @@ set(FlatBuffers_Tests_SRCS
   tests/test_builder.cpp
   tests/native_type_test_impl.h
   tests/native_type_test_impl.cpp
+  include/flatbuffers/code_generators.h
+  src/code_generators.cpp
   # file generate by running compiler on tests/monster_test.fbs
   ${CMAKE_CURRENT_BINARY_DIR}/tests/monster_test_generated.h
   # file generate by running compiler on namespace_test/namespace_test1.fbs
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 5795a70f1..78614fb06 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -36,8 +36,7 @@ LOCAL_MODULE := flatbuffers_extra
 LOCAL_SRC_FILES := src/idl_parser.cpp \
                    src/idl_gen_text.cpp \
                    src/reflection.cpp \
-                   src/util.cpp \
-                   src/code_generators.cpp
+                   src/util.cpp
 LOCAL_STATIC_LIBRARIES := flatbuffers
 LOCAL_ARM_MODE := arm
 include $(BUILD_STATIC_LIBRARY)
@@ -53,7 +52,8 @@ LOCAL_SRC_FILES := android/jni/main.cpp \
                    tests/test_builder.cpp \
                    tests/native_type_test_impl.h \
                    tests/native_type_test_impl.cpp \
-                   src/idl_gen_fbs.cpp
+                   src/idl_gen_fbs.cpp \
+                   src/code_generators.cpp
 LOCAL_LDLIBS := -llog -landroid -latomic
 LOCAL_STATIC_LIBRARIES := android_native_app_glue flatbuffers_extra
 LOCAL_ARM_MODE := arm
diff --git a/tests/fuzzer/CMakeLists.txt b/tests/fuzzer/CMakeLists.txt
index 7df5df2a2..de1626f38 100644
--- a/tests/fuzzer/CMakeLists.txt
+++ b/tests/fuzzer/CMakeLists.txt
@@ -40,7 +40,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
 set(FLATBUFFERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
 
 set(FlatBuffers_Library_SRCS
-  ${FLATBUFFERS_DIR}/include/flatbuffers/code_generators.h
   ${FLATBUFFERS_DIR}/include/flatbuffers/base.h
   ${FLATBUFFERS_DIR}/include/flatbuffers/flatbuffers.h
   ${FLATBUFFERS_DIR}/include/flatbuffers/hash.h
@@ -52,7 +51,6 @@ set(FlatBuffers_Library_SRCS
   ${FLATBUFFERS_DIR}/include/flatbuffers/flexbuffers.h
   ${FLATBUFFERS_DIR}/include/flatbuffers/registry.h
   ${FLATBUFFERS_DIR}/include/flatbuffers/minireflect.h
-  ${FLATBUFFERS_DIR}/src/code_generators.cpp
   ${FLATBUFFERS_DIR}/src/idl_parser.cpp
   ${FLATBUFFERS_DIR}/src/idl_gen_text.cpp
   ${FLATBUFFERS_DIR}/src/reflection.cpp