swap.h only needs to be present in the header for the type aliases and definitions, it's not actually needed in the cpp files though. input.h is just unused entirely in xpad.h
@@ -4,7 +4,6 @@
#include <cstring>
#include "common/common_types.h"
-#include "common/swap.h"
#include "core/core_timing.h"
#include "core/hle/service/hid/controllers/debug_pad.h"
#include "core/hle/service/hid/controllers/gesture.h"
#include "core/hle/service/hid/controllers/keyboard.h"
#include "core/hle/service/hid/controllers/mouse.h"
@@ -9,7 +9,6 @@
#include "common/bit_field.h"
#include "common/logging/log.h"
#include "core/core.h"
#include "core/frontend/input.h"
#include "core/hle/service/hid/controllers/stubbed.h"
#include "core/frontend/emu_window.h"
#include "core/hle/service/hid/controllers/xpad.h"
@@ -7,7 +7,6 @@
#include "common/common_funcs.h"
#include "common/swap.h"
-#include "core/frontend/input.h"
#include "core/hle/service/hid/controllers/controller_base.h"
namespace Service::HID {