From b1810072cbf08cac869363c14e4db4d580be8537 Mon Sep 17 00:00:00 2001
From: Ahsan Saghir <ahsaghir@amd.com>
Date: Tue, 12 Sep 2023 20:58:27 +0000
Subject: [PATCH] Remove redundant headers

---
 test/ref/abs.cpp                   |  2 +-
 test/ref/acos.cpp                  |  2 +-
 test/ref/acosh.cpp                 |  2 +-
 test/ref/add.cpp                   |  2 +-
 test/ref/allocate.cpp              |  2 +-
 test/ref/argmax.cpp                |  2 +-
 test/ref/argmin.cpp                |  2 +-
 test/ref/asin.cpp                  |  2 +-
 test/ref/asinh.cpp                 |  2 +-
 test/ref/atan.cpp                  |  2 +-
 test/ref/atanh.cpp                 |  2 +-
 test/ref/broadcast.cpp             |  2 +-
 test/ref/ceil.cpp                  |  2 +-
 test/ref/clip.cpp                  |  2 +-
 test/ref/concat.cpp                |  2 +-
 test/ref/contiguous.cpp            |  2 +-
 test/ref/convert.cpp               |  2 +-
 test/ref/convolution.cpp           |  2 +-
 test/ref/convolution_backwards.cpp |  2 +-
 test/ref/cos.cpp                   |  2 +-
 test/ref/cosh.cpp                  |  2 +-
 test/ref/dequantizelinear.cpp      |  2 +-
 test/ref/dimensions_of.cpp         |  2 +-
 test/ref/div.cpp                   |  2 +-
 test/ref/dot_op.cpp                | 11 ++++-------
 test/ref/elu.cpp                   |  2 +-
 test/ref/equal.cpp                 |  2 +-
 test/ref/erf.cpp                   |  2 +-
 test/ref/exp.cpp                   |  2 +-
 test/ref/floor.cpp                 |  2 +-
 test/ref/fmod.cpp                  |  2 +-
 test/ref/gather.cpp                |  2 +-
 test/ref/gathernd.cpp              |  2 +-
 test/ref/greater.cpp               |  2 +-
 test/ref/identity.cpp              |  2 +-
 test/ref/if.cpp                    |  2 +-
 test/ref/im2col.cpp                |  2 +-
 test/ref/isnan.cpp                 |  2 +-
 test/ref/leaky_relu.cpp            |  2 +-
 test/ref/less.cpp                  |  2 +-
 test/ref/log.cpp                   |  2 +-
 test/ref/logical_and.cpp           |  2 +-
 test/ref/logical_or.cpp            |  2 +-
 test/ref/logical_xor.cpp           |  2 +-
 test/ref/logsoftmax.cpp            |  2 +-
 test/ref/loop.cpp                  |  7 ++-----
 test/ref/lrn.cpp                   |  2 +-
 test/ref/max.cpp                   |  2 +-
 test/ref/min.cpp                   |  2 +-
 test/ref/mod.cpp                   |  2 +-
 test/ref/mul.cpp                   |  2 +-
 test/ref/multibroadcast.cpp        |  2 +-
 test/ref/multinomial.cpp           |  2 +-
 test/ref/neg.cpp                   |  2 +-
 test/ref/nonmaxsuppression.cpp     |  2 +-
 test/ref/nonzero.cpp               |  2 +-
 test/ref/not.cpp                   |  2 +-
 test/ref/pad.cpp                   |  2 +-
 test/ref/pointwise.cpp             |  2 +-
 test/ref/pooling.cpp               |  2 +-
 test/ref/pow.cpp                   |  2 +-
 test/ref/prefix_scan_sum.cpp       |  2 +-
 test/ref/prelu.cpp                 |  2 +-
 test/ref/quant_convolution.cpp     |  2 +-
 test/ref/quantizelinear.cpp        |  2 +-
 test/ref/recip.cpp                 |  2 +-
 test/ref/reduce_max.cpp            |  2 +-
 test/ref/reduce_mean.cpp           |  2 +-
 test/ref/reduce_min.cpp            |  2 +-
 test/ref/reduce_prod.cpp           |  2 +-
 test/ref/reduce_sum.cpp            |  2 +-
 test/ref/relu.cpp                  |  2 +-
 test/ref/reshape.cpp               |  2 +-
 test/ref/reverse.cpp               |  2 +-
 test/ref/rnn_ops.cpp               | 11 +++--------
 test/ref/roialign.cpp              |  2 +-
 test/ref/round.cpp                 |  2 +-
 test/ref/rsqrt.cpp                 |  2 +-
 test/ref/scalar.cpp                |  2 +-
 test/ref/scatter.cpp               |  2 +-
 test/ref/scatternd_add.cpp         |  2 +-
 test/ref/scatternd_mul.cpp         |  2 +-
 test/ref/scatternd_none.cpp        |  2 +-
 test/ref/select_module.cpp         |  2 +-
 test/ref/sigmoid.cpp               |  2 +-
 test/ref/sign.cpp                  |  2 +-
 test/ref/sin.cpp                   |  2 +-
 test/ref/sinh.cpp                  |  2 +-
 test/ref/slice.cpp                 |  2 +-
 test/ref/softmax.cpp               |  2 +-
 test/ref/sqdiff.cpp                |  2 +-
 test/ref/sqrt.cpp                  |  2 +-
 test/ref/squeeze.cpp               |  2 +-
 test/ref/step.cpp                  |  2 +-
 test/ref/sub.cpp                   |  2 +-
 test/ref/tan.cpp                   |  2 +-
 test/ref/tanh.cpp                  |  2 +-
 test/ref/topk.cpp                  |  2 +-
 test/ref/transpose.cpp             |  2 +-
 test/ref/unsqueeze.cpp             |  2 +-
 test/ref/where.cpp                 |  2 +-
 101 files changed, 107 insertions(+), 118 deletions(-)

diff --git a/test/ref/abs.cpp b/test/ref/abs.cpp
index 104991a0bde..e415e8fd49e 100644
--- a/test/ref/abs.cpp
+++ b/test/ref/abs.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/acos.cpp b/test/ref/acos.cpp
index 20488992f69..db2c0edbd47 100644
--- a/test/ref/acos.cpp
+++ b/test/ref/acos.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/acosh.cpp b/test/ref/acosh.cpp
index 80651e1c7fc..efd1e6083ca 100644
--- a/test/ref/acosh.cpp
+++ b/test/ref/acosh.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/add.cpp b/test/ref/add.cpp
index a67663e7c0e..a5b6829aec8 100644
--- a/test/ref/add.cpp
+++ b/test/ref/add.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/quantization.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
diff --git a/test/ref/allocate.cpp b/test/ref/allocate.cpp
index e139ab045c6..4c2247a0894 100644
--- a/test/ref/allocate.cpp
+++ b/test/ref/allocate.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/argmax.cpp b/test/ref/argmax.cpp
index e98cb6ce2b8..953caa115a8 100644
--- a/test/ref/argmax.cpp
+++ b/test/ref/argmax.cpp
@@ -25,7 +25,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/argmin.cpp b/test/ref/argmin.cpp
index ad598bd8113..55d297f7d4d 100644
--- a/test/ref/argmin.cpp
+++ b/test/ref/argmin.cpp
@@ -25,7 +25,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/asin.cpp b/test/ref/asin.cpp
index bcedd61da0b..9dbfea0420d 100644
--- a/test/ref/asin.cpp
+++ b/test/ref/asin.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/asinh.cpp b/test/ref/asinh.cpp
index 788e4760f15..93c89d80835 100644
--- a/test/ref/asinh.cpp
+++ b/test/ref/asinh.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/atan.cpp b/test/ref/atan.cpp
index 3ab049ed46e..c8eafe52c21 100644
--- a/test/ref/atan.cpp
+++ b/test/ref/atan.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/atanh.cpp b/test/ref/atanh.cpp
index 3c83792c259..ce51a4e1071 100644
--- a/test/ref/atanh.cpp
+++ b/test/ref/atanh.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/broadcast.cpp b/test/ref/broadcast.cpp
index 7b8b62453d6..016696c7a50 100644
--- a/test/ref/broadcast.cpp
+++ b/test/ref/broadcast.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/ceil.cpp b/test/ref/ceil.cpp
index 169020ee32c..a6ff8b42030 100644
--- a/test/ref/ceil.cpp
+++ b/test/ref/ceil.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/clip.cpp b/test/ref/clip.cpp
index cfc249513b2..e346d1d9b21 100644
--- a/test/ref/clip.cpp
+++ b/test/ref/clip.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/concat.cpp b/test/ref/concat.cpp
index ba761da1fe3..4b0c3878252 100644
--- a/test/ref/concat.cpp
+++ b/test/ref/concat.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/contiguous.cpp b/test/ref/contiguous.cpp
index 81a4ad1e195..7b91fef268a 100644
--- a/test/ref/contiguous.cpp
+++ b/test/ref/contiguous.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/convert.cpp b/test/ref/convert.cpp
index cd666f0d833..7ec30611e92 100644
--- a/test/ref/convert.cpp
+++ b/test/ref/convert.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/convolution.cpp b/test/ref/convolution.cpp
index 25c39654610..7d50efa0f29 100644
--- a/test/ref/convolution.cpp
+++ b/test/ref/convolution.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/op/pooling.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
diff --git a/test/ref/convolution_backwards.cpp b/test/ref/convolution_backwards.cpp
index 4c4a9d61a2c..9f27627e602 100644
--- a/test/ref/convolution_backwards.cpp
+++ b/test/ref/convolution_backwards.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/cos.cpp b/test/ref/cos.cpp
index 6c296bae667..ff8aadfe7b4 100644
--- a/test/ref/cos.cpp
+++ b/test/ref/cos.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/cosh.cpp b/test/ref/cosh.cpp
index 0cf219d86b9..44f3fbe6f9e 100644
--- a/test/ref/cosh.cpp
+++ b/test/ref/cosh.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/dequantizelinear.cpp b/test/ref/dequantizelinear.cpp
index 12aec62145a..e26941a6d3a 100644
--- a/test/ref/dequantizelinear.cpp
+++ b/test/ref/dequantizelinear.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/dimensions_of.cpp b/test/ref/dimensions_of.cpp
index 272f5498538..5e738de2753 100644
--- a/test/ref/dimensions_of.cpp
+++ b/test/ref/dimensions_of.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/div.cpp b/test/ref/div.cpp
index 8be1c1d3be9..0d12d575e13 100644
--- a/test/ref/div.cpp
+++ b/test/ref/div.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/dot_op.cpp b/test/ref/dot_op.cpp
index 8230c2ff28e..eb984c269b4 100644
--- a/test/ref/dot_op.cpp
+++ b/test/ref/dot_op.cpp
@@ -21,18 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <iostream>
-#include <vector>
-#include <migraphx/literal.hpp>
+#include <migraphx/apply_alpha_beta.hpp>
 #include <migraphx/instruction.hpp>
+#include <migraphx/literal.hpp>
+#include <migraphx/make_op.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
-#include <migraphx/onnx.hpp>
-#include <migraphx/make_op.hpp>
-#include <migraphx/apply_alpha_beta.hpp>
 
 #include "test.hpp"
-#include <migraphx/half.hpp>
 
 template <class T>
 void dot_2d_test()
diff --git a/test/ref/elu.cpp b/test/ref/elu.cpp
index 48475e73d88..1e67ed5f921 100644
--- a/test/ref/elu.cpp
+++ b/test/ref/elu.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/equal.cpp b/test/ref/equal.cpp
index 1caa1ffbdf5..1a8ad021b06 100644
--- a/test/ref/equal.cpp
+++ b/test/ref/equal.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/erf.cpp b/test/ref/erf.cpp
index 3cca339fe61..d0e139cbafc 100644
--- a/test/ref/erf.cpp
+++ b/test/ref/erf.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/exp.cpp b/test/ref/exp.cpp
index d7fee9f3a29..ee2df9a3698 100644
--- a/test/ref/exp.cpp
+++ b/test/ref/exp.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/floor.cpp b/test/ref/floor.cpp
index 7d16ec4adff..5309f3ea271 100644
--- a/test/ref/floor.cpp
+++ b/test/ref/floor.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/fmod.cpp b/test/ref/fmod.cpp
index ba5e0b3f6a0..00248ad6516 100644
--- a/test/ref/fmod.cpp
+++ b/test/ref/fmod.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/gather.cpp b/test/ref/gather.cpp
index e44e76f7a51..6f12a52026d 100644
--- a/test/ref/gather.cpp
+++ b/test/ref/gather.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/gathernd.cpp b/test/ref/gathernd.cpp
index 2599df94483..cccde261e2d 100644
--- a/test/ref/gathernd.cpp
+++ b/test/ref/gathernd.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/greater.cpp b/test/ref/greater.cpp
index b666ff9c9c8..6a9892691ef 100644
--- a/test/ref/greater.cpp
+++ b/test/ref/greater.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/identity.cpp b/test/ref/identity.cpp
index a052b3a23e1..b88fc23c9e3 100644
--- a/test/ref/identity.cpp
+++ b/test/ref/identity.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/if.cpp b/test/ref/if.cpp
index e689bcfebf0..8bb7ad5f0d5 100644
--- a/test/ref/if.cpp
+++ b/test/ref/if.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/im2col.cpp b/test/ref/im2col.cpp
index a26aa4d4847..e1cce978e18 100644
--- a/test/ref/im2col.cpp
+++ b/test/ref/im2col.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/isnan.cpp b/test/ref/isnan.cpp
index bfcbe595c74..30510acb2e5 100644
--- a/test/ref/isnan.cpp
+++ b/test/ref/isnan.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/leaky_relu.cpp b/test/ref/leaky_relu.cpp
index da4a838da5a..241c1919b3d 100644
--- a/test/ref/leaky_relu.cpp
+++ b/test/ref/leaky_relu.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/less.cpp b/test/ref/less.cpp
index 12fe32a5834..cd7cd77bbfb 100644
--- a/test/ref/less.cpp
+++ b/test/ref/less.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/log.cpp b/test/ref/log.cpp
index 0a48721eea8..6a28c3f4891 100644
--- a/test/ref/log.cpp
+++ b/test/ref/log.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/logical_and.cpp b/test/ref/logical_and.cpp
index 3258a174751..057814d9108 100644
--- a/test/ref/logical_and.cpp
+++ b/test/ref/logical_and.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/logical_or.cpp b/test/ref/logical_or.cpp
index 1517b138458..55eac634188 100644
--- a/test/ref/logical_or.cpp
+++ b/test/ref/logical_or.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/logical_xor.cpp b/test/ref/logical_xor.cpp
index b9e14d10894..4662483e768 100644
--- a/test/ref/logical_xor.cpp
+++ b/test/ref/logical_xor.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/logsoftmax.cpp b/test/ref/logsoftmax.cpp
index 4d5c9c0728e..b65627a73f2 100644
--- a/test/ref/logsoftmax.cpp
+++ b/test/ref/logsoftmax.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/loop.cpp b/test/ref/loop.cpp
index e0288d12d12..e94298f9014 100644
--- a/test/ref/loop.cpp
+++ b/test/ref/loop.cpp
@@ -21,15 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <iostream>
-#include <vector>
-#include <cmath>
-#include <migraphx/literal.hpp>
 #include <migraphx/instruction.hpp>
+#include <migraphx/literal.hpp>
+#include <migraphx/make_op.hpp>
 #include <migraphx/quantization.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
-#include <migraphx/make_op.hpp>
 
 #include "test.hpp"
 
diff --git a/test/ref/lrn.cpp b/test/ref/lrn.cpp
index ebe08d72f04..083f47a1c6d 100644
--- a/test/ref/lrn.cpp
+++ b/test/ref/lrn.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/max.cpp b/test/ref/max.cpp
index 1a17db6676a..ed47c01c2aa 100644
--- a/test/ref/max.cpp
+++ b/test/ref/max.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/min.cpp b/test/ref/min.cpp
index f88882df038..219e2a327db 100644
--- a/test/ref/min.cpp
+++ b/test/ref/min.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/mod.cpp b/test/ref/mod.cpp
index c0eaec19a3b..ee6f749e152 100644
--- a/test/ref/mod.cpp
+++ b/test/ref/mod.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/mul.cpp b/test/ref/mul.cpp
index dd6fd47cf09..87a8ce77d6e 100644
--- a/test/ref/mul.cpp
+++ b/test/ref/mul.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/multibroadcast.cpp b/test/ref/multibroadcast.cpp
index 573a8c7ed64..ee96e434d07 100644
--- a/test/ref/multibroadcast.cpp
+++ b/test/ref/multibroadcast.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/multinomial.cpp b/test/ref/multinomial.cpp
index f1e61b954a2..6a7d05dcf88 100644
--- a/test/ref/multinomial.cpp
+++ b/test/ref/multinomial.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 #include <random>
diff --git a/test/ref/neg.cpp b/test/ref/neg.cpp
index 8b7749ca7ac..72274eba9a9 100644
--- a/test/ref/neg.cpp
+++ b/test/ref/neg.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/nonmaxsuppression.cpp b/test/ref/nonmaxsuppression.cpp
index 92ea5decb38..9c42672a9ef 100644
--- a/test/ref/nonmaxsuppression.cpp
+++ b/test/ref/nonmaxsuppression.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/nonzero.cpp b/test/ref/nonzero.cpp
index 2bd2e022d37..5391bc385e0 100644
--- a/test/ref/nonzero.cpp
+++ b/test/ref/nonzero.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/not.cpp b/test/ref/not.cpp
index a04ef00c1ce..6aeee040d59 100644
--- a/test/ref/not.cpp
+++ b/test/ref/not.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/pad.cpp b/test/ref/pad.cpp
index 026893c8b5d..6bec2bdf718 100644
--- a/test/ref/pad.cpp
+++ b/test/ref/pad.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/pointwise.cpp b/test/ref/pointwise.cpp
index 1be568b32ba..020019b98c0 100644
--- a/test/ref/pointwise.cpp
+++ b/test/ref/pointwise.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/pooling.cpp b/test/ref/pooling.cpp
index 478a16f2d4d..0af2273d60c 100644
--- a/test/ref/pooling.cpp
+++ b/test/ref/pooling.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/op/pooling.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
diff --git a/test/ref/pow.cpp b/test/ref/pow.cpp
index 41b839aac54..cba3380a823 100644
--- a/test/ref/pow.cpp
+++ b/test/ref/pow.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/prefix_scan_sum.cpp b/test/ref/prefix_scan_sum.cpp
index 815f77314ae..312bad14b6a 100644
--- a/test/ref/prefix_scan_sum.cpp
+++ b/test/ref/prefix_scan_sum.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/prelu.cpp b/test/ref/prelu.cpp
index 89a1b66a6aa..cfe4ee8b385 100644
--- a/test/ref/prelu.cpp
+++ b/test/ref/prelu.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/quant_convolution.cpp b/test/ref/quant_convolution.cpp
index 64c0d7991af..6973f35957f 100644
--- a/test/ref/quant_convolution.cpp
+++ b/test/ref/quant_convolution.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/quantizelinear.cpp b/test/ref/quantizelinear.cpp
index 719e77e3c39..ccae072c4a1 100644
--- a/test/ref/quantizelinear.cpp
+++ b/test/ref/quantizelinear.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/recip.cpp b/test/ref/recip.cpp
index 6d9ef63acb9..b10ed427fe7 100644
--- a/test/ref/recip.cpp
+++ b/test/ref/recip.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/reduce_max.cpp b/test/ref/reduce_max.cpp
index df4fc87f25e..19b4cc9ec62 100644
--- a/test/ref/reduce_max.cpp
+++ b/test/ref/reduce_max.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/reduce_mean.cpp b/test/ref/reduce_mean.cpp
index cfa0be80a4e..fb7c2b421c3 100644
--- a/test/ref/reduce_mean.cpp
+++ b/test/ref/reduce_mean.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/reduce_min.cpp b/test/ref/reduce_min.cpp
index 377e64adb37..e1f1796bf03 100644
--- a/test/ref/reduce_min.cpp
+++ b/test/ref/reduce_min.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/reduce_prod.cpp b/test/ref/reduce_prod.cpp
index 5de50ec88dd..9c2a9b180b5 100644
--- a/test/ref/reduce_prod.cpp
+++ b/test/ref/reduce_prod.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/reduce_sum.cpp b/test/ref/reduce_sum.cpp
index ff596e9ad2e..51514a719c2 100644
--- a/test/ref/reduce_sum.cpp
+++ b/test/ref/reduce_sum.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/relu.cpp b/test/ref/relu.cpp
index 59af3449506..9c466134451 100644
--- a/test/ref/relu.cpp
+++ b/test/ref/relu.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/reshape.cpp b/test/ref/reshape.cpp
index 00d0db33291..f18a0063f09 100644
--- a/test/ref/reshape.cpp
+++ b/test/ref/reshape.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/reverse.cpp b/test/ref/reverse.cpp
index 0b5057eae53..261fbaa9901 100644
--- a/test/ref/reverse.cpp
+++ b/test/ref/reverse.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/rnn_ops.cpp b/test/ref/rnn_ops.cpp
index 23e287e545f..f93c0ac4ab3 100644
--- a/test/ref/rnn_ops.cpp
+++ b/test/ref/rnn_ops.cpp
@@ -21,18 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <iostream>
-#include <vector>
+#include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
+#include <migraphx/make_op.hpp>
 #include <migraphx/op/common.hpp>
-#include <migraphx/instruction.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
-#include <migraphx/onnx.hpp>
-#include <migraphx/make_op.hpp>
-
-#include <migraphx/quantization.hpp>
-#include <migraphx/serialize.hpp>
 
 #include "test.hpp"
 
diff --git a/test/ref/roialign.cpp b/test/ref/roialign.cpp
index 644b3cb43ca..a93962c5046 100644
--- a/test/ref/roialign.cpp
+++ b/test/ref/roialign.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/op/pooling.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
diff --git a/test/ref/round.cpp b/test/ref/round.cpp
index 4e060e04288..0d0a32372ce 100644
--- a/test/ref/round.cpp
+++ b/test/ref/round.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/rsqrt.cpp b/test/ref/rsqrt.cpp
index 2664a7c9deb..00fe860abc5 100644
--- a/test/ref/rsqrt.cpp
+++ b/test/ref/rsqrt.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/scalar.cpp b/test/ref/scalar.cpp
index c128e420f69..eb0f7bec218 100644
--- a/test/ref/scalar.cpp
+++ b/test/ref/scalar.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/scatter.cpp b/test/ref/scatter.cpp
index 5fce7b9fe73..44b7504daff 100644
--- a/test/ref/scatter.cpp
+++ b/test/ref/scatter.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/scatternd_add.cpp b/test/ref/scatternd_add.cpp
index 2c551c978d8..5f59322a4b5 100644
--- a/test/ref/scatternd_add.cpp
+++ b/test/ref/scatternd_add.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/scatternd_mul.cpp b/test/ref/scatternd_mul.cpp
index 73b1dd59d28..df7dfc8db8c 100644
--- a/test/ref/scatternd_mul.cpp
+++ b/test/ref/scatternd_mul.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/scatternd_none.cpp b/test/ref/scatternd_none.cpp
index 6e4d1287803..a432712930d 100644
--- a/test/ref/scatternd_none.cpp
+++ b/test/ref/scatternd_none.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/select_module.cpp b/test/ref/select_module.cpp
index 30353d867cb..ca0de07496e 100644
--- a/test/ref/select_module.cpp
+++ b/test/ref/select_module.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/sigmoid.cpp b/test/ref/sigmoid.cpp
index 45e1f71c7e7..8b371ee0e02 100644
--- a/test/ref/sigmoid.cpp
+++ b/test/ref/sigmoid.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/sign.cpp b/test/ref/sign.cpp
index 910848518af..50b58e06f67 100644
--- a/test/ref/sign.cpp
+++ b/test/ref/sign.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/sin.cpp b/test/ref/sin.cpp
index aa6a13139a9..3d7fc24f94d 100644
--- a/test/ref/sin.cpp
+++ b/test/ref/sin.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/sinh.cpp b/test/ref/sinh.cpp
index 5942876de31..ccfe5de978c 100644
--- a/test/ref/sinh.cpp
+++ b/test/ref/sinh.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/slice.cpp b/test/ref/slice.cpp
index e27f28f4496..8c2193a96a3 100644
--- a/test/ref/slice.cpp
+++ b/test/ref/slice.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/softmax.cpp b/test/ref/softmax.cpp
index ad5df4e7693..01cc1bcdfa5 100644
--- a/test/ref/softmax.cpp
+++ b/test/ref/softmax.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/sqdiff.cpp b/test/ref/sqdiff.cpp
index 180e84ec2bb..68bac4cfa4f 100644
--- a/test/ref/sqdiff.cpp
+++ b/test/ref/sqdiff.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/sqrt.cpp b/test/ref/sqrt.cpp
index 5760091bdb2..5718ab144ce 100644
--- a/test/ref/sqrt.cpp
+++ b/test/ref/sqrt.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/squeeze.cpp b/test/ref/squeeze.cpp
index 174d4e17eba..338c324df14 100644
--- a/test/ref/squeeze.cpp
+++ b/test/ref/squeeze.cpp
@@ -25,7 +25,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/step.cpp b/test/ref/step.cpp
index 834f3f8f683..d4d9f2e4387 100644
--- a/test/ref/step.cpp
+++ b/test/ref/step.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/sub.cpp b/test/ref/sub.cpp
index 80ba868fc51..03ed68138c2 100644
--- a/test/ref/sub.cpp
+++ b/test/ref/sub.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/tan.cpp b/test/ref/tan.cpp
index b40dbf74dd6..d2c18428550 100644
--- a/test/ref/tan.cpp
+++ b/test/ref/tan.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/tanh.cpp b/test/ref/tanh.cpp
index 46197312b21..9a218ec08fa 100644
--- a/test/ref/tanh.cpp
+++ b/test/ref/tanh.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/topk.cpp b/test/ref/topk.cpp
index 385bc4ff97d..3e0f363b97a 100644
--- a/test/ref/topk.cpp
+++ b/test/ref/topk.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/transpose.cpp b/test/ref/transpose.cpp
index 336faf9c514..dbabc6fc98b 100644
--- a/test/ref/transpose.cpp
+++ b/test/ref/transpose.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/unsqueeze.cpp b/test/ref/unsqueeze.cpp
index 7cec82055ef..38310eee61c 100644
--- a/test/ref/unsqueeze.cpp
+++ b/test/ref/unsqueeze.cpp
@@ -25,7 +25,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>
 
diff --git a/test/ref/where.cpp b/test/ref/where.cpp
index ebeac6822ba..33094235343 100644
--- a/test/ref/where.cpp
+++ b/test/ref/where.cpp
@@ -24,7 +24,7 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/make_op.hpp>
-#include <migraphx/onnx.hpp>
+#include <migraphx/program.hpp>
 #include <migraphx/register_target.hpp>
 #include <migraphx/verify.hpp>