Another round of brute force include optimization

src/arg_parser.hpp

@@ -19,7 +19,6 @@
 #ifndef HEADER_ARG_PARSER_HPP
 #define HEADER_ARG_PARSER_HPP
 
-#include <iosfwd>
 #include <vector>
 #include <string>
 

src/axis_event.cpp

@@ -19,8 +19,8 @@
 #include "axis_event.hpp"
 
 #include <boost/tokenizer.hpp>
-#include <string>
 
+#include "evdev_helper.hpp"
 #include "log.hpp"
 #include "uinput.hpp"
 

src/axis_filter.cpp

@@ -19,11 +19,7 @@
 #include "axis_filter.hpp"
 
 #include <boost/lexical_cast.hpp>
-#include <boost/tokenizer.hpp>
-#include <iostream>
-#include <math.h>
-
-#include "helper.hpp"
+#include <stdexcept>
 
 #include "axisfilter/calibration_axis_filter.hpp"
 #include "axisfilter/deadzone_axis_filter.hpp"

src/button_event.cpp

@@ -19,9 +19,9 @@
 #include "button_event.hpp"
 
 #include <boost/tokenizer.hpp>
-#include <errno.h>
 #include <fstream>
 
+#include "evdev_helper.hpp"
 #include "log.hpp"
 #include "uinput.hpp"
 

src/button_filter.cpp

@@ -20,7 +20,6 @@
 
 #include <boost/tokenizer.hpp>
 #include <boost/lexical_cast.hpp>
-#include <iostream>
 
 #include "buttonfilter/autofire_button_filter.hpp"
 #include "buttonfilter/invert_button_filter.hpp"

src/chatpad.cpp

@@ -18,11 +18,8 @@
 
 #include "chatpad.hpp"
 
-#include <boost/format.hpp>
-
 #include "helper.hpp"
 #include "linux_uinput.hpp"
-#include "log.hpp"
 #include "raise_exception.hpp"
 #include "usb_helper.hpp"
 

src/command_line_options.cpp

@@ -23,10 +23,10 @@
 #include <boost/bind.hpp>
 #include <boost/tokenizer.hpp>
 
+#include "evdev_helper.hpp"
 #include "helper.hpp"
 #include "ini_parser.hpp"
 #include "ini_schema_builder.hpp"
-#include "log.hpp"
 #include "options.hpp"
 
 #include "axisfilter/relative_axis_filter.hpp"

src/controller_config.cpp

@@ -19,7 +19,6 @@
 #include "controller_config.hpp"
 
 #include "controller_options.hpp"
-#include "options.hpp"
 
 ControllerConfig::ControllerConfig(UInput& uinput, int slot, bool extra_devices, const ControllerOptions& opts) :
   m_modifier(),

src/controller_slot_config.cpp

@@ -20,8 +20,6 @@
 
 #include <boost/bind.hpp>
 
-#include "controller_options.hpp"
-#include "log.hpp"
 #include "uinput.hpp"
 
 #include "modifier/dpad_rotation_modifier.hpp"

src/dummy_message_processor.cpp

@@ -18,9 +18,6 @@
 
 #include "dummy_message_processor.hpp"
 
-#include "log.hpp"
-#include "xboxmsg.hpp"
-
 DummyMessageProcessor::DummyMessageProcessor()
 {
 }

src/headset.cpp

@@ -18,7 +18,6 @@
 
 #include "headset.hpp"
 
-#include <boost/format.hpp>
 #include <fstream>
 
 #include "helper.hpp"

src/helper.cpp

@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <stdexcept>
 
 #include "raise_exception.hpp"
 

src/linux_uinput.cpp

@@ -24,7 +24,6 @@
 
 #include "evdev_helper.hpp"
 #include "force_feedback_handler.hpp"
-#include "log.hpp"
 #include "raise_exception.hpp"
 
 LinuxUinput::LinuxUinput(DeviceType device_type, const std::string& name_, uint16_t vendor_, uint16_t product_) :

src/modifier/axismap_modifier.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_MODIFIER_AXISMAP_MODIFIER_HPP
 #define HEADER_XBOXDRV_MODIFIER_AXISMAP_MODIFIER_HPP
 
-#include <vector>
-
 #include "axis_filter.hpp"
 #include "modifier.hpp"
 

src/uinput.hpp

@@ -19,19 +19,10 @@
 #ifndef HEADER_UINPUT_HPP
 #define HEADER_UINPUT_HPP
 
-#include <vector>
-#include <map>
-#include <memory>
-#include <stdexcept>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
 #include "axis_event.hpp"
-#include "button_event.hpp"
-#include "evdev_helper.hpp"
 #include "linux_uinput.hpp"
-#include "uinput_options.hpp"
-#include "xpad_device.hpp"
 
 struct Xbox360Msg;
 struct XboxMsg;

src/uinput_config.cpp

@@ -19,6 +19,7 @@
 #include "uinput_config.hpp"
 
 #include "uinput.hpp"
+#include "uinput_options.hpp"
 
 namespace {
 // FIXME: duplicate code

src/usb_read_thread.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_USB_READ_THREAD_HPP
 #define HEADER_USB_READ_THREAD_HPP
 
-#include <memory>
-#include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/shared_array.hpp>

src/xbox_controller.cpp

@@ -22,7 +22,6 @@
 #include <stdexcept>
 #include <string.h>
 
-#include "log.hpp"
 #include "usb_helper.hpp"
 #include "raise_exception.hpp"
 #include "xboxmsg.hpp"

src/xboxdrv.cpp

@@ -26,12 +26,13 @@
 
 #include "command_line_options.hpp"
 #include "dummy_message_processor.hpp"
-#include "uinput_message_processor.hpp"
 #include "evdev_controller.hpp"
+#include "evdev_helper.hpp"
 #include "helper.hpp"
 #include "raise_exception.hpp"
-#include "word_wrap.hpp"
+#include "uinput_message_processor.hpp"
 #include "usb_helper.hpp"
+#include "word_wrap.hpp"
 #include "xbox_controller_factory.hpp"
 #include "xboxdrv_daemon.hpp"
 #include "xboxdrv_thread.hpp"

src/xboxdrv_daemon.cpp

@@ -20,12 +20,10 @@
 
 #include <boost/format.hpp>
 #include <fstream>
-#include <stdexcept>
 
 #include "uinput_message_processor.hpp"
 #include "dummy_message_processor.hpp"
 #include "helper.hpp"
-#include "log.hpp"
 #include "raise_exception.hpp"
 #include "uinput.hpp"
 #include "usb_helper.hpp"

src/xboxdrv_daemon.hpp

@@ -20,11 +20,8 @@
 #define HEADER_XBOXDRV_XBOXDRV_DAEMON_HPP
 
 #include <libudev.h>
-#include <stdint.h>
-#include <vector>
 
 #include "controller_slot_config.hpp"
-#include "controller_match_rule.hpp"
 
 class Options;
 class UInput;

src/xboxdrv_thread.hpp

@@ -19,11 +19,8 @@
 #ifndef HEADER_XBOXDRV_XBOXDRV_THREAD_HPP
 #define HEADER_XBOXDRV_XBOXDRV_THREAD_HPP
 
-#include <memory>
 #include <boost/thread.hpp>
 
-#include "xboxmsg.hpp"
-#include "modifier.hpp"
 #include "controller_slot_config.hpp"
 
 class Options;

src/xboxmsg.cpp

@@ -21,7 +21,6 @@
 #include <boost/format.hpp>
 
 #include "helper.hpp"
-#include "options.hpp"
 
 int16_t u8_to_s16(uint8_t value)
 {