diff --git a/CHANGES b/CHANGES
index eb34c92953..a7cf56e01c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+7.2.0-dev.638 | 2025-04-25 06:41:06 -0700
+
+  * Skip linting on highwayhash and src/3rdparty files (Tim Wojtulewicz, Corelight)
+
 7.2.0-dev.636 | 2025-04-25 06:40:46 -0700
 
   * Minor changes to storage framework script docs (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 010472b8d2..0ccf1e55ed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.2.0-dev.636
+7.2.0-dev.638
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2532d75cf..8b2d2fb8f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -478,12 +478,12 @@ if (USE_SQLITE AND WNOERROR_FLAG)
     set_source_files_properties(3rdparty/sqlite3.c PROPERTIES COMPILE_FLAGS ${WNOERROR_FLAG})
 endif ()
 
+set_source_files_properties(${THIRD_PARTY_SRCS} PROPERTIES SKIP_LINTING ON)
+
 # Highwayhash. Highwayhash is a bit special since it has architecture dependent
 # code...
 set(hhash_dir ${PROJECT_SOURCE_DIR}/auxil/highwayhash/highwayhash)
-zeek_add_subdir_library(
-    hhash
-    SOURCES
+set(hhash_sources
     ${hhash_dir}/sip_hash.cc
     ${hhash_dir}/sip_tree_hash.cc
     ${hhash_dir}/scalar_sip_tree_hash.cc
@@ -493,6 +493,8 @@ zeek_add_subdir_library(
     ${hhash_dir}/os_specific.cc
     ${hhash_dir}/hh_portable.cc)
 
+zeek_add_subdir_library(hhash SOURCES ${hhash_sources})
+
 if (${COMPILER_ARCHITECTURE} STREQUAL "arm")
     check_c_source_compiles(
         "
@@ -506,14 +508,17 @@ if (${COMPILER_ARCHITECTURE} STREQUAL "arm")
 
     if (test_arm_neon)
         target_sources(zeek_hhash_obj PRIVATE ${hhash_dir}/hh_neon.cc)
+        list(APPEND hhash_sources ${hhash_dir}/hh_neon.cc)
     endif ()
 
     target_compile_options(zeek_hhash_obj PRIVATE -mfloat-abi=hard -march=armv7-a -mfpu=neon)
 elseif (${COMPILER_ARCHITECTURE} STREQUAL "aarch64")
     target_sources(zeek_hhash_obj PRIVATE ${hhash_dir}/hh_neon.cc)
+    list(APPEND hhash_sources ${hhash_dir}/hh_neon.cc)
 elseif (${COMPILER_ARCHITECTURE} STREQUAL "power")
     target_sources(zeek_hhash_obj PRIVATE ${hhash_dir}/hh_vsx.cc)
     set_source_files_properties(${hhash_dir}/hh_vsx.cc PROPERTIES COMPILE_FLAGS -mvsx)
+    list(APPEND hhash_sources ${hhash_dir}/hh_vsx.cc)
 elseif (${COMPILER_ARCHITECTURE} STREQUAL "x86_64")
     target_sources(zeek_hhash_obj PRIVATE ${hhash_dir}/hh_avx2.cc ${hhash_dir}/hh_sse41.cc)
     if (MSVC)
@@ -528,8 +533,11 @@ elseif (${COMPILER_ARCHITECTURE} STREQUAL "x86_64")
 
     set_source_files_properties(${hhash_dir}/hh_avx2.cc PROPERTIES COMPILE_FLAGS ${_avx_flag})
     set_source_files_properties(${hhash_dir}/hh_sse41.cc PROPERTIES COMPILE_FLAGS ${_sse_flag})
+    list(APPEND hhash_sources ${hhash_dir}/hh_avx2.cc ${hhash_dir}/hh_sse41.cc)
 endif ()
 
+set_source_files_properties(${hhash_sources} PROPERTIES SKIP_LINTING ON)
+
 set(zeek_SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/version.c
     ${BIF_SRCS}