diff --git a/projects/clr/hipamd/bin/findcode.sh b/projects/clr/hipamd/bin/findcode.sh
index d092d6bf8d..dbdb768d75 100755
--- a/projects/clr/hipamd/bin/findcode.sh
+++ b/projects/clr/hipamd/bin/findcode.sh
@@ -2,4 +2,7 @@
 
 SEARCH_DIRS=$@
 
-find $SEARCH_DIRS -name '*.cpp' -o -name '*.h' -o -name '*.cu' -o -name '*.cuh' -o -name '*.c' -o -name '*.hpp' -o -name '*.inl'
+find $SEARCH_DIRS -name '*.cu'
+find $SEARCH_DIRS -name '*.cpp' -o -name '*.cxx' -o -name '*.c' -o -name '*.cc'
+find $SEARCH_DIRS -name '*.cuh'
+find $SEARCH_DIRS -name '*.h' -o -name '*.hpp' -o -name '*.inc' -o -name '*.inl' -o -name '*.hxx' -o -name '*.hdl'
diff --git a/projects/clr/hipamd/bin/finduncodep.sh b/projects/clr/hipamd/bin/finduncodep.sh
index 509f6e37b7..298d05d7ec 100755
--- a/projects/clr/hipamd/bin/finduncodep.sh
+++ b/projects/clr/hipamd/bin/finduncodep.sh
@@ -2,4 +2,4 @@
 
 SEARCH_DIR=$1
 
-find $SEARCH_DIR -not -name '*.cpp' -and  -not -name '*.h' -and -not -name '*.cu' -and -not -name '*.cuh' -and -not -name '*.c' -and -not -name '*.hpp'
+find $SEARCH_DIR -not -name '*.cu' -and -not -name '*.cpp' -and -not -name '*.cxx' -and -not -name '*.c' -and -not -name '*.cc' -and -not -name '*.cuh' -and -not -name '*.h' -and -not -name '*.hpp' -and -not -name '*.inc' -and -not -name '*.inl' -and -not -name '*.hxx' -and -not -name '*.hdl'