Another round of brute force include cleanup

src/arg_parser.hpp

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

src/axis_event.hpp

@@ -19,10 +19,7 @@
 #ifndef HEADER_XBOXDRV_AXIS_EVENT_HPP
 #define HEADER_XBOXDRV_AXIS_EVENT_HPP
 
-#include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <string>
-#include <vector>
 
 #include "axis_filter.hpp"
 #include "ui_event.hpp"

src/axis_map.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_AXIS_MAP_HPP
 #define HEADER_XBOXDRV_AXIS_MAP_HPP
 
-#include <assert.h>
-
 #include "axis_event.hpp"
 #include "xboxmsg.hpp"
 

src/button_event.hpp

@@ -19,9 +19,7 @@
 #ifndef HEADER_XBOXDRV_BUTTON_EVENT_HPP
 #define HEADER_XBOXDRV_BUTTON_EVENT_HPP
 
-#include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <string>
 #include <vector>
 
 #include "button_filter.hpp"

src/button_map.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_BUTTON_MAP_HPP
 #define HEADER_XBOXDRV_BUTTON_MAP_HPP
 
-#include <assert.h>
-
 #include "button_event.hpp"
 #include "xboxmsg.hpp"
 

src/chatpad.cpp

@@ -18,7 +18,6 @@
 
 #include "chatpad.hpp"
 
-#include <iostream>
 #include <boost/format.hpp>
 
 #include "linux_uinput.hpp"
@@ -221,12 +220,12 @@ Chatpad::read_thread()
       {
         if (m_debug)
         {
-          std::cout << "[chatpad] read: " << len << "/5: data: " << std::flush;
+          log_info << "[chatpad] read: " << len << "/5: data: " << std::flush;
           for(int i = 0; i < len; ++i)
           {
-            std::cout << boost::format("0x%02x ") % int(data[i]);
+            log_info << boost::format("0x%02x ") % int(data[i]);
           }
-          std::cout << std::endl;
+          log_info << std::endl;
         }
 
         if (data[0] == 0x00)

src/chatpad.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_CHATPAD_HPP
 #define HEADER_XBOXDRV_CHATPAD_HPP
 
-#include <stdint.h>
-#include <memory>
 #include <boost/thread.hpp>
 #include <libusb.h>
 

src/command_line_options.hpp

@@ -19,14 +19,9 @@
 #ifndef HEADER_COMMAND_LINE_OPTIONS_HPP
 #define HEADER_COMMAND_LINE_OPTIONS_HPP
 
-#include <vector>
-#include <map>
-
 #include "arg_parser.hpp"
 #include "ini_schema.hpp"
-#include "modifier.hpp"
 #include "uinput.hpp"
-#include "xboxmsg.hpp"
 
 class Xboxdrv;
 

src/controller_config.hpp

@@ -19,9 +19,6 @@
 #ifndef HEADER_XBOXDRV_CONTROLLER_CONFIG_HPP
 #define HEADER_XBOXDRV_CONTROLLER_CONFIG_HPP
 
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
 #include "uinput_config.hpp"
 #include "modifier.hpp"
 

src/controller_config_set.cpp

@@ -18,8 +18,6 @@
 
 #include "controller_config_set.hpp"
 
-#include "uinput.hpp"
-#include "options.hpp"
 #include "log.hpp"
 
 #include "modifier/dpad_rotation_modifier.hpp"

src/controller_config_set.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_CONTROLLER_CONFIG_SET_HPP
 #define HEADER_XBOXDRV_CONTROLLER_CONFIG_SET_HPP
 
-#include <boost/shared_ptr.hpp>
-
 #include "controller_config.hpp"
 #include "options.hpp"
 

src/default_message_processor.cpp

@@ -19,7 +19,6 @@
 #include "default_message_processor.hpp"
 
 #include "log.hpp"
-#include "options.hpp"
 #include "uinput.hpp"
 
 DefaultMessageProcessor::DefaultMessageProcessor(uInput& uinput, ControllerConfigSetPtr config, 

src/default_message_processor.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_DEFAULT_MESSAGE_PROCESSOR_HPP
 #define HEADER_XBOXDRV_DEFAULT_MESSAGE_PROCESSOR_HPP
 
-#include <vector>
-
 #include "controller_config_set.hpp"
 #include "message_processor.hpp"
 

src/evdev_controller.hpp

@@ -21,10 +21,8 @@
 
 #include <linux/input.h>
 #include <string>
-#include <map>
 #include <queue>
 
-#include "xboxmsg.hpp"
 #include "evdev_absmap.hpp"
 #include "xbox_generic_controller.hpp"
 

src/evdev_helper.cpp

@@ -19,7 +19,6 @@
 #include "evdev_helper.hpp"
 
 #include <linux/input.h>
-#include <stdexcept>
 
 #include "log.hpp"
 

src/evdev_helper.hpp

@@ -19,7 +19,6 @@
 #ifndef HEADER_EVDEV_HELPER_HPP
 #define HEADER_EVDEV_HELPER_HPP
 
-#include <string>
 #include <X11/Xlib.h>
 
 #include "enum_box.hpp"

src/headset.hpp

@@ -20,7 +20,6 @@
 #define HEADER_XBOXDRV_HEADSET_HPP
 
 #include <libusb.h>
-#include <memory>
 #include <boost/thread.hpp>
 
 class Headset

src/helper.hpp

@@ -19,9 +19,6 @@
 #ifndef HEADER_HELPER_HPP
 #define HEADER_HELPER_HPP
 
-#include <iosfwd>
-#include <vector>
-#include <stdint.h>
 #include <boost/function.hpp>
 
 void print_raw_data(std::ostream& out, uint8_t* buffer, int len);

src/ini_parser.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_INI_PARSER_HPP
 #define HEADER_XBOXDRV_INI_PARSER_HPP
 
-#include <map>
-#include <string>
 #include <sstream>
 
 class INIBuilder;

src/ini_schema.hpp

@@ -20,7 +20,6 @@
 #define HEADER_XBOXDRV_INI_SCHEMA_HPP
 
 #include <map>
-#include <string>
 #include <boost/function.hpp>
 
 class INIPairSchema

src/linux_uinput.cpp

@@ -19,8 +19,6 @@
 #include "linux_uinput.hpp"
 
 #include <boost/format.hpp>
-#include <iostream>
-#include <sstream>
 #include <errno.h>
 #include <fcntl.h>
 

src/linux_uinput.hpp

@@ -21,8 +21,6 @@
 
 #include <boost/function.hpp>
 #include <linux/uinput.h>
-#include <string>
-#include <stdint.h>
 
 class ForceFeedbackHandler;
 

src/modifier.hpp

@@ -19,13 +19,8 @@
 #ifndef HEADER_MODIFIER_HPP
 #define HEADER_MODIFIER_HPP
 
-#include <stdlib.h>
-#include <string>
-#include <vector>
 #include <boost/shared_ptr.hpp>
 
-#include "axis_filter.hpp"
-#include "button_filter.hpp"
 #include "xboxmsg.hpp"
 
 class Modifier;

src/modifier/axismap_modifier.hpp

@@ -21,6 +21,7 @@
 
 #include <vector>
 
+#include "axis_filter.hpp"
 #include "modifier.hpp"
 
 struct AxisMapping

src/modifier/buttonmap_modifier.hpp

@@ -19,6 +19,9 @@
 #ifndef HEADER_XBOXDRV_MODIFIER_BUTTON_MAP_MODIFIER_HPP
 #define HEADER_XBOXDRV_MODIFIER_BUTTON_MAP_MODIFIER_HPP
 
+#include <vector>
+
+#include "button_filter.hpp"
 #include "modifier.hpp"
 
 struct ButtonMapping

src/modifier/dpad_rotation_modifier.hpp

@@ -19,6 +19,8 @@
 #ifndef HEADER_XBOXDRV_MODIFIER_DPAD_ROTATION_MODIFIER_HPP
 #define HEADER_XBOXDRV_MODIFIER_DPAD_ROTATION_MODIFIER_HPP
 
+#include <vector>
+
 #include "modifier.hpp"
 
 class XboxGenericMsg;

src/modifier/four_way_restrictor_modifier.hpp

@@ -19,6 +19,8 @@
 #ifndef HEADER_XBOXDRV_MODIFIER_FOUR_WAY_RESTRICTOR_MODIFIER_HPP
 #define HEADER_XBOXDRV_MODIFIER_FOUR_WAY_RESTRICTOR_MODIFIER_HPP
 
+#include <vector>
+
 #include "modifier.hpp"
 
 class FourWayRestrictorModifier : public Modifier

src/modifier/rotate_axis_modifier.hpp

@@ -19,6 +19,8 @@
 #ifndef HEADER_XBOXDRV_MODIFIER_ROTATE_AXIS_MODIFIER_HPP
 #define HEADER_XBOXDRV_MODIFIER_ROTATE_AXIS_MODIFIER_HPP
 
+#include <vector>
+
 #include "modifier.hpp"
 
 class RotateAxisModifier : public Modifier

src/modifier/square_axis_modifier.hpp

@@ -19,6 +19,8 @@
 #ifndef HEADER_XBOXDRV_MODIFIER_SQUARE_AXIS_MODIFIER_HPP
 #define HEADER_XBOXDRV_MODIFIER_SQUARE_AXIS_MODIFIER_HPP
 
+#include <vector>
+
 #include "modifier.hpp"
 
 class SquareAxisModifier : public Modifier

src/options.hpp

@@ -24,7 +24,6 @@
 #include <vector>
 
 #include "evdev_absmap.hpp"
-#include "modifier.hpp"
 #include "uinput_options.hpp"
 #include "xpad_device.hpp"
 

src/playstation3_usb_controller.cpp

@@ -21,7 +21,6 @@
 #include <boost/format.hpp>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 #include <string.h>
 
 #include "xboxmsg.hpp"

src/uinput.cpp

@@ -18,8 +18,6 @@
 
 #include "uinput.hpp"
 
-#include <iostream>
-
 #include "log.hpp"
 
 bool

src/uinput_config.hpp

@@ -19,8 +19,6 @@
 #ifndef HEADER_XBOXDRV_UINPUT_CONFIG_HPP
 #define HEADER_XBOXDRV_UINPUT_CONFIG_HPP
 
-#include <map>
-
 #include "axis_map.hpp"
 #include "button_map.hpp"
 

src/uinput_options.hpp

@@ -19,13 +19,8 @@
 #ifndef HEADER_XBOXDRV_UINPUT_CFG_HPP
 #define HEADER_XBOXDRV_UINPUT_CFG_HPP
 
-#include <vector>
-
-#include "axis_event.hpp"
-#include "button_event.hpp"
 #include "button_map.hpp"
 #include "axis_map.hpp"
-#include "xboxmsg.hpp"
 
 class UInputOptions
 {

src/usb_helper.cpp

@@ -18,8 +18,6 @@
 
 #include "usb_helper.hpp"
 
-#include <libusb.h>
-
 int usb_claim_n_detach_interface(libusb_device_handle* handle, int interface, bool try_detach)
 {
   int ret = libusb_claim_interface(handle, interface);

src/xbox360_controller.cpp

@@ -18,8 +18,6 @@
 
 #include "xbox360_controller.hpp"
 
-#include <iostream>
-
 #include "chatpad.hpp"
 #include "headset.hpp"
 #include "helper.hpp"

src/xbox360_wireless_controller.cpp

@@ -19,7 +19,6 @@
 #include "xbox360_wireless_controller.hpp"
 
 #include <sstream>
-#include <iostream>
 #include <boost/format.hpp>
 
 #include "helper.hpp"

src/xbox_controller.cpp

@@ -18,7 +18,6 @@
 
 #include "xbox_controller.hpp"
 
-#include <iostream>
 #include <sstream>
 #include <stdexcept>
 #include <string.h>

src/xbox_controller_factory.hpp

@@ -19,10 +19,8 @@
 #ifndef HEADER_XBOXDRV_XBOX_CONTROLLER_FACTORY_HPP
 #define HEADER_XBOXDRV_XBOX_CONTROLLER_FACTORY_HPP
 
-#include <memory>
 #include <libusb.h>
 
-#include "xpad_device.hpp"
 #include "options.hpp"
 
 class XboxGenericController;

src/xboxdrv_thread.cpp

@@ -22,7 +22,6 @@
 
 #include "helper.hpp"
 #include "log.hpp"
-#include "options.hpp"
 #include "xbox_generic_controller.hpp"
 #include "message_processor.hpp"