strat: split out common functionality for future meso use

common/include/atmosphere/version.h

@@ -23,6 +23,6 @@
 
 #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MAJOR 9
 #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR 0
-#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 0
+#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 1
 
 #endif

stratosphere/boot/source/boot_battery_driver.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_battery_driver.hpp"
 #include "boot_calibration.hpp"
 #include "boot_i2c_utils.hpp"

stratosphere/boot/source/boot_battery_driver.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c/driver/i2c_api.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_battery_icons.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_battery_icons.hpp"
 #include "boot_display.hpp"
 

stratosphere/boot/source/boot_battery_icons.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_boot_reason.cpp

@@ -13,9 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/spl.hpp>
-
 #include "boot_boot_reason.hpp"
 #include "boot_pmic_driver.hpp"
 #include "boot_rtc_driver.hpp"

stratosphere/boot/source/boot_boot_reason.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_bq24193_charger.hpp

@@ -13,6 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
+#include <stratosphere.hpp>
 
 namespace ams::boot::bq24193 {
 

stratosphere/boot/source/boot_calibration.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_calibration.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_calibration.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_change_voltage.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_change_voltage.hpp"
 #include "boot_pmc_wrapper.hpp"
 

stratosphere/boot/source/boot_change_voltage.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_charger_driver.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "boot_charger_driver.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_charger_driver.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "boot_bq24193_charger.hpp"
 #include "boot_i2c_utils.hpp"
 

stratosphere/boot/source/boot_check_battery.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_battery_driver.hpp"
 #include "boot_battery_icons.hpp"
 #include "boot_boot_reason.hpp"

stratosphere/boot/source/boot_check_battery.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_check_clock.cpp

@@ -13,8 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/reg.hpp>
 #include "boot_check_clock.hpp"
 #include "boot_power_utils.hpp"
 

stratosphere/boot/source/boot_check_clock.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_clock_initial_configuration.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_clock_initial_configuration.hpp"
 #include "boot_pmc_wrapper.hpp"
 #include "boot_registers_pmc.hpp"

stratosphere/boot/source/boot_clock_initial_configuration.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_display.cpp

@@ -13,11 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-
-#include <stratosphere/reg.hpp>
-#include <stratosphere/spl.hpp>
-
 #include "boot_display.hpp"
 #include "boot_i2c_utils.hpp"
 #include "boot_pmc_wrapper.hpp"

stratosphere/boot/source/boot_display.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_fan_enable.cpp

@@ -13,9 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/spl.hpp>
-
 #include "boot_fan_enable.hpp"
 
 #include "gpio/gpio_utils.hpp"

stratosphere/boot/source/boot_fan_enable.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_i2c_utils.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_i2c_utils.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_i2c_utils.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 #include "i2c/driver/i2c_api.hpp"

stratosphere/boot/source/boot_main.cpp

@@ -13,17 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <malloc.h>
-
-#include <switch.h>
-#include <atmosphere.h>
-#include <stratosphere.hpp>
-#include <stratosphere/spl.hpp>
-
 #include "boot_boot_reason.hpp"
 #include "boot_change_voltage.hpp"
 #include "boot_check_battery.hpp"

stratosphere/boot/source/boot_pcv.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c/i2c_types.hpp"
 #include "i2c/driver/impl/i2c_pcv.hpp"
 #include "i2c/driver/impl/i2c_registers.hpp"

stratosphere/boot/source/boot_pmc_wrapper.cpp

@@ -13,8 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stratosphere/spl.hpp>
-#include <stratosphere/spl/smc/spl_smc.hpp>
 #include "boot_pmc_wrapper.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_pmc_wrapper.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_pmic_driver.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "boot_i2c_utils.hpp"
 #include "boot_pmic_driver.hpp"
 

stratosphere/boot/source/boot_pmic_driver.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "boot_battery_driver.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_power_utils.cpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-#include <strings.h>
-
+#pragma once
 #include "boot_power_utils.hpp"
 #include "fusee-primary_bin.h"
 

stratosphere/boot/source/boot_power_utils.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_registers_clkrst.hpp

@@ -13,9 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
+#include <stratosphere.hpp>
 
 static constexpr size_t CLK_RST_CONTROLLER_RST_SOURCE = 0x0;
 static constexpr size_t CLK_RST_CONTROLLER_RST_DEVICES_L = 0x4;

stratosphere/boot/source/boot_registers_di.hpp

@@ -15,9 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
+#include <stratosphere.hpp>
 
 #define DC_CMD_GENERAL_INCR_SYNCPT 0x00
 

stratosphere/boot/source/boot_registers_gpio.hpp

@@ -13,9 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
+#include <stratosphere.hpp>
 
 static constexpr size_t GPIO_PORT3_CNF_0 = 0x200;
 static constexpr size_t GPIO_PORT3_OE_0  = 0x210;

stratosphere/boot/source/boot_registers_pinmux.hpp

@@ -13,9 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
+#include <stratosphere.hpp>
 
 static constexpr size_t APB_MISC_GP_SDMMC1_CLK_LPBK_CONTROL = 0x8D4;
 static constexpr size_t APB_MISC_GP_SDMMC3_CLK_LPBK_CONTROL = 0x8D8;

stratosphere/boot/source/boot_registers_pmc.hpp

@@ -13,9 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
+#include <stratosphere.hpp>
 
 static constexpr uintptr_t PmcBase = 0x7000E400ul;
 

stratosphere/boot/source/boot_repair_boot_images.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/spl.hpp>
-#include <stratosphere/updater.hpp>
-
 #include "boot_power_utils.hpp"
 #include "boot_repair_boot_images.hpp"
 

stratosphere/boot/source/boot_repair_boot_images.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_rtc_driver.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "boot_rtc_driver.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_rtc_driver.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "boot_i2c_utils.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_splash_screen.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "boot_boot_reason.hpp"
 #include "boot_display.hpp"
 #include "boot_splash_screen.hpp"

stratosphere/boot/source/boot_splash_screen.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/boot_wake_pins.cpp

@@ -13,9 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/spl.hpp>
-
 #include "boot_pmc_wrapper.hpp"
 #include "boot_wake_pins.hpp"
 

stratosphere/boot/source/boot_wake_pins.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::boot {

stratosphere/boot/source/i2c/driver/i2c_api.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_api.hpp"
 #include "impl/i2c_resource_manager.hpp"
 

stratosphere/boot/source/i2c/driver/i2c_api.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "../i2c_types.hpp"
 #include "../i2c_command_list.hpp"
 

stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_pcv.hpp"
 #include "i2c_bus_accessor.hpp"
 

stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_driver_types.hpp"
 #include "i2c_registers.hpp"
 

stratosphere/boot/source/i2c/driver/impl/i2c_device_config.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_driver_types.hpp"
 
 namespace ams::i2c::driver::impl {

stratosphere/boot/source/i2c/driver/impl/i2c_driver_types.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "../../i2c_types.hpp"
 
 namespace ams::i2c::driver::impl {

stratosphere/boot/source/i2c/driver/impl/i2c_pcv.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 /* This forward declares the functionality from pcv that i2c::driver uses. */

stratosphere/boot/source/i2c/driver/impl/i2c_registers.hpp

@@ -13,12 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-#include <stratosphere/reg.hpp>
-
 #include "i2c_driver_types.hpp"
 
 namespace ams::i2c::driver::impl {

stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_pcv.hpp"
 #include "i2c_resource_manager.hpp"
 

stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "../i2c_api.hpp"
 #include "i2c_driver_types.hpp"
 #include "i2c_bus_accessor.hpp"

stratosphere/boot/source/i2c/driver/impl/i2c_session.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_session.hpp"
 
 namespace ams::i2c::driver::impl {

stratosphere/boot/source/i2c/driver/impl/i2c_session.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_driver_types.hpp"
 #include "i2c_bus_accessor.hpp"
 

stratosphere/boot/source/i2c/i2c_command_list.cpp

@@ -13,10 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_types.hpp"
 #include "i2c_command_list.hpp"
 

stratosphere/boot/source/i2c/i2c_command_list.hpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-
 #include "i2c_types.hpp"
 
 namespace ams::i2c {

stratosphere/boot/source/i2c/i2c_types.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::i2c {

stratosphere/boot/source/pinmux/pinmux_initial_configuration.cpp

@@ -13,9 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/spl.hpp>
-
 #include "pinmux_initial_configuration.hpp"
 #include "pinmux_utils.hpp"
 

stratosphere/boot/source/pinmux/pinmux_initial_configuration.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::pinmux {

stratosphere/boot/source/pinmux/pinmux_utils.cpp

@@ -13,9 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/reg.hpp>
-
 #include "pinmux_utils.hpp"
 
 namespace ams::pinmux {

stratosphere/boot/source/pinmux/pinmux_utils.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::pinmux {

stratosphere/boot2/source/boot2_main.cpp

@@ -13,11 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
-#include <atmosphere.h>
 #include <stratosphere.hpp>
-#include <stratosphere/boot2.hpp>
 
 extern "C" {
     extern u32 __start__;

stratosphere/creport/source/creport_crash_report.cpp

@@ -13,11 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-
 #include <sys/stat.h>
 #include <sys/types.h>
-
 #include "creport_crash_report.hpp"
 #include "creport_utils.hpp"
 

stratosphere/creport/source/creport_crash_report.hpp

@@ -13,12 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
-#include <map>
-
 #include "creport_threads.hpp"
 #include "creport_modules.hpp"
 

stratosphere/creport/source/creport_main.cpp

@@ -13,14 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <cstdlib>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-
-#include <switch.h>
-#include <stratosphere.hpp>
 #include "creport_crash_report.hpp"
 #include "creport_utils.hpp"
 

stratosphere/creport/source/creport_modules.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "creport_modules.hpp"
 #include "creport_utils.hpp"
 

stratosphere/creport/source/creport_modules.hpp

@@ -13,10 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
-#include <stratosphere.hpp>
 #include "creport_threads.hpp"
 
 namespace ams::creport {

stratosphere/creport/source/creport_threads.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "creport_threads.hpp"
 #include "creport_modules.hpp"
 

stratosphere/creport/source/creport_threads.hpp

@@ -13,11 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
-#include <map>
 
 namespace ams::creport {
 

stratosphere/creport/source/creport_utils.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "creport_utils.hpp"
 
 namespace ams::creport {

stratosphere/creport/source/creport_utils.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::creport {

stratosphere/dmnt/source/cheat/dmnt_cheat_service.cpp

@@ -13,8 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <switch.h>
 #include "dmnt_cheat_service.hpp"
 #include "impl/dmnt_cheat_api.hpp"
 

stratosphere/dmnt/source/cheat/dmnt_cheat_service.hpp

@@ -13,11 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
-#include <stratosphere/dmnt.hpp>
 
 namespace ams::dmnt::cheat {
 

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.cpp

@@ -13,12 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <map>
 #include "dmnt_cheat_api.hpp"
 #include "dmnt_cheat_vm.hpp"
 #include "dmnt_cheat_debug_events_manager.hpp"
-#include <stratosphere/map.hpp>
 
 namespace ams::dmnt::cheat::impl {
 

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.hpp

@@ -13,10 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 #include <stratosphere.hpp>
-#include <stratosphere/dmnt.hpp>
 
 namespace ams::dmnt::cheat::impl {
 

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "dmnt_cheat_debug_events_manager.hpp"
 
 /* WORKAROUND: This design prevents a kernel deadlock from occurring on 6.0.0+ */

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::dmnt::cheat::impl {

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include <sys/stat.h>
 #include "dmnt_cheat_vm.hpp"
 #include "dmnt_cheat_api.hpp"

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.hpp

@@ -13,11 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <stdarg.h>
 #include <stratosphere.hpp>
-#include <stratosphere/dmnt.hpp>
 
 namespace ams::dmnt::cheat::impl {
 

stratosphere/dmnt/source/dmnt_main.cpp

@@ -13,16 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <malloc.h>
-
-#include <switch.h>
-#include <atmosphere.h>
-#include <stratosphere.hpp>
-
 #include "dmnt_service.hpp"
 #include "cheat/dmnt_cheat_service.hpp"
 

stratosphere/dmnt/source/dmnt_service.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::dmnt {

stratosphere/dmnt/source/dmnt_service_debug.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "dmnt_service.hpp"
 
 namespace ams::dmnt {

stratosphere/dmnt/source/dmnt_service_target_io.cpp

@@ -13,8 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <unordered_map>
 #include "dmnt_service.hpp"
 
 namespace std {

stratosphere/eclct.stub/source/eclct_stub.cpp

@@ -13,14 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <malloc.h>
-
-#include <switch.h>
-#include <atmosphere.h>
 #include <stratosphere.hpp>
 
 extern "C" {

stratosphere/fatal/source/fatal_config.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "fatal_config.hpp"
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_config.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_debug.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <unordered_map>
 #include "fatal_debug.hpp"
 #include "fatal_config.hpp"
 

stratosphere/fatal/source/fatal_debug.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_event_manager.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "fatal_event_manager.hpp"
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_event_manager.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_font.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include <ft2build.h>
 #include FT_FREETYPE_H
 

stratosphere/fatal/source/fatal_font.hpp

@@ -13,10 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <cstdarg>
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::fatal::srv::font {

stratosphere/fatal/source/fatal_main.cpp

@@ -13,15 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-
-#include <switch.h>
-#include <atmosphere.h>
-#include <stratosphere.hpp>
-
 #include "fatal_service.hpp"
 #include "fatal_config.hpp"
 #include "fatal_repair.hpp"

stratosphere/fatal/source/fatal_repair.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "fatal_repair.hpp"
 #include "fatal_service_for_self.hpp"
 

stratosphere/fatal/source/fatal_repair.hpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
-#include <switch.h>
 #include <stratosphere.hpp>
 
 namespace ams::fatal::srv {