From e4e188e125d5c764d203f0bf9941e594178c60a3 Mon Sep 17 00:00:00 2001
From: Jakub Strzebonski <jakub.strzebonski@ng-analytics.com>
Date: Tue, 8 Feb 2022 11:06:05 +0100
Subject: [PATCH] #1667 clean up configs/error

---
 src/vt/configs/error/code.h               | 2 --
 src/vt/configs/error/common.h             | 3 +--
 src/vt/configs/error/config_assert.h      | 4 ----
 src/vt/configs/error/error.h              | 2 --
 src/vt/configs/error/error.impl.h         | 1 +
 src/vt/configs/error/keyval_printer.h     | 3 ---
 src/vt/configs/error/pretty_print_stack.h | 3 +--
 src/vt/configs/error/soft_error.h         | 2 ++
 8 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/vt/configs/error/code.h b/src/vt/configs/error/code.h
index 73b33012b4..1f77cd4384 100644
--- a/src/vt/configs/error/code.h
+++ b/src/vt/configs/error/code.h
@@ -44,8 +44,6 @@
 #if !defined INCLUDED_VT_CONFIGS_ERROR_CODE_H
 #define INCLUDED_VT_CONFIGS_ERROR_CODE_H
 
-#include "vt/configs/error/code_class.h"
-
 #include <cstdlib>
 
 namespace vt { namespace error {
diff --git a/src/vt/configs/error/common.h b/src/vt/configs/error/common.h
index 068d262b0b..7a215d25f1 100644
--- a/src/vt/configs/error/common.h
+++ b/src/vt/configs/error/common.h
@@ -44,8 +44,7 @@
 #if !defined INCLUDED_VT_CONFIGS_ERROR_COMMON_H
 #define INCLUDED_VT_CONFIGS_ERROR_COMMON_H
 
-#include "vt/configs/types/types_headers.h"
-#include "vt/collective/basic.h"
+#include "vt/configs/types/types_type.h"
 
 #define INVERT_COND(cond) (!(cond))
 #define DEBUG_LOCATION __FILE__,__LINE__,__func__
diff --git a/src/vt/configs/error/config_assert.h b/src/vt/configs/error/config_assert.h
index 427b880bef..8b41608954 100644
--- a/src/vt/configs/error/config_assert.h
+++ b/src/vt/configs/error/config_assert.h
@@ -49,12 +49,8 @@
  *  build/runtime mode when the assertion breaks
  */
 
-#include "vt/configs/debug/debug_config.h"
-#include "vt/configs/types/types_type.h"
-#include "vt/configs/error/common.h"
 #include "vt/configs/error/assert_out.h"
 #include "vt/configs/error/assert_out_info.h"
-#include "vt/configs/error/keyval_printer.h"
 
 #include <tuple>
 #include <type_traits>
diff --git a/src/vt/configs/error/error.h b/src/vt/configs/error/error.h
index 438601b137..83ffc42b96 100644
--- a/src/vt/configs/error/error.h
+++ b/src/vt/configs/error/error.h
@@ -45,8 +45,6 @@
 #define INCLUDED_VT_CONFIGS_ERROR_ERROR_H
 
 #include "vt/configs/types/types_headers.h"
-#include "vt/configs/debug/debug_config.h"
-#include "vt/configs/error/common.h"
 
 #include <string>
 #include <tuple>
diff --git a/src/vt/configs/error/error.impl.h b/src/vt/configs/error/error.impl.h
index 7f3317cf57..a92c09f82a 100644
--- a/src/vt/configs/error/error.impl.h
+++ b/src/vt/configs/error/error.impl.h
@@ -49,6 +49,7 @@
 #include "vt/configs/error/common.h"
 #include "vt/configs/error/error.h"
 #include "vt/configs/error/pretty_print_message.h"
+#include "vt/collective/basic.h"
 
 #include <string>
 #include <tuple>
diff --git a/src/vt/configs/error/keyval_printer.h b/src/vt/configs/error/keyval_printer.h
index 7008152875..db714b0544 100644
--- a/src/vt/configs/error/keyval_printer.h
+++ b/src/vt/configs/error/keyval_printer.h
@@ -44,9 +44,6 @@
 #if !defined INCLUDED_VT_CONFIGS_ERROR_KEYVAL_PRINTER_H
 #define INCLUDED_VT_CONFIGS_ERROR_KEYVAL_PRINTER_H
 
-#include "vt/configs/error/common.h"
-#include "vt/configs/debug/debug_config.h"
-
 #include <cstdlib>
 #include <tuple>
 #include <type_traits>
diff --git a/src/vt/configs/error/pretty_print_stack.h b/src/vt/configs/error/pretty_print_stack.h
index 3d89e26307..c625864574 100644
--- a/src/vt/configs/error/pretty_print_stack.h
+++ b/src/vt/configs/error/pretty_print_stack.h
@@ -45,8 +45,7 @@
 #define INCLUDED_VT_CONFIGS_ERROR_PRETTY_PRINT_STACK_H
 
 #include "vt/config.h"
-#include "vt/configs/error/stack_out.h"
-#include "vt/configs/debug/debug_colorize.h"
+#include "vt/context/context.h"
 
 #include <string>
 
diff --git a/src/vt/configs/error/soft_error.h b/src/vt/configs/error/soft_error.h
index 7b939081fe..67edd3bf7a 100644
--- a/src/vt/configs/error/soft_error.h
+++ b/src/vt/configs/error/soft_error.h
@@ -51,9 +51,11 @@
  *  the cost of these checks can be fully optimized out.
  */
 
+#include "vt/collective/basic.h"
 #include "vt/configs/types/types_type.h"
 #include "vt/configs/error/common.h"
 #include "vt/configs/error/pretty_print_message.h"
+#include "vt/configs/features/features_defines.h"
 
 #include <string>