reduce header includes

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index 8968974526a64d67d19c942f70373a03e0032770..eefcdc23650e055c58e5bca3e7048c0fde2c0a11 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -1,11 +1,10 @@
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <curl/curl.h>
 #include "config.h"
+#include "kds_s2000w_client.h"
 #include "kds_s2000w_config.h"
 #include "kds_s2000w_heartbeat.h"
-#include "kds_s2000w_client.h"
 #include "kds_s2000w_debug.h"
 
 #define MAX_STR_BUFFER_LENGTH  80

diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h
index 5aa6af40b7ad00662e500e2c4ffc4db28cc48d0f..464f30dd96aa382fd3856cb6c746b2ed8e2b3210 100644 (file)
--- a/src/kds_s2000w_client.h
+++ b/src/kds_s2000w_client.h
@@ -1,5 +1,6 @@
 #ifndef KDS_S2000W_CLIENT_H
 #define KDS_S2000W_CLIENT_H
+
 typedef struct {
        char* data;
        size_t size;
@@ -20,4 +21,5 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response*
 int kds_s2000w_client_get_capabilities(response* resp);
 int kds_s2000w_client_get_option(int64_t sessionid, response* resp);
 int kds_s2000w_client_set_option(int64_t sessionid, response* resp);
+
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index dd385849d7175dcbac9dfa3b5e17fcb3220e6b5b..6e684325c6706ba7b64ea078074d38617ace4224 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <math.h>

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 1507ac9b747c2fb4acea3a99b9efc73fe0bfe303..fba170b513808e5e1cb19b2ecc558a16a072ba5b 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -66,4 +66,5 @@ void kds_s2000w_handler_set_option(handler* handle, int option, void* value, int
 void kds_s2000w_handler_set_option_auto(int option);
 void kds_s2000w_handler_start_scan(handler* h);
 void kds_s2000w_handler_stop_scan(handler* h);
+
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index b1a53f4d3285ec26797f064770c566108fed795a..9ee056624d6c76febf30f69160f6ef6c3db115ee 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -1,8 +1,7 @@
 #include <string.h>
 #include <json-c/json.h>
-#include "kds_s2000w_handler.h"
-#include "kds_s2000w_client.h"
 #include "kds_s2000w_handler_opts.h"
+#include "kds_s2000w_client.h"
 #include "kds_s2000w_debug.h"
 
 #define AUTOSTART_ON 1

diff --git a/src/kds_s2000w_handler_opts.h b/src/kds_s2000w_handler_opts.h
index f42974393eb78f3b866814e499915f88aa08ec66..0b41e7a481ae71ba3f9a8a27e6a63299d2301d4c 100644 (file)
--- a/src/kds_s2000w_handler_opts.h
+++ b/src/kds_s2000w_handler_opts.h
@@ -1,5 +1,8 @@
 #ifndef KDS_S2000W_HANDLER_OPTS_H
 #define KDS_S2000W_HANDLER_OPTS_H
+#include "kds_s2000w_handler.h"
+
 void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* info);
 void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* info);
+
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_image_converter.c b/src/kds_s2000w_image_converter.c
index d9f09f9bf211ccbcdaca4b091243251103a59dab..6878fd5301d71b313052df3fb7579772276c6a36 100644 (file)
--- a/src/kds_s2000w_image_converter.c
+++ b/src/kds_s2000w_image_converter.c
@@ -5,8 +5,6 @@
 #define IMAGE_MAGICK_MAJOR 6
 #endif
 
-#include <stdio.h>
-#include <string.h>
 #if IMAGE_MAGICK_MAJOR == 6
 #include <magick/MagickCore.h>
 #endif

diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h
index 01b47b6915ee9ed4b84e84df772ca90f35ff6699..20af3a6565c0057efeebe2f7f3a788f91b236154 100644 (file)
--- a/src/kds_s2000w_image_converter.h
+++ b/src/kds_s2000w_image_converter.h
@@ -15,4 +15,5 @@ typedef struct {
 void kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out, int depth);
 void kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out);
 void kds_s2000w_metadata_from_image(blobdata* image, image_metadata* mdata);
+
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index e8dd77e7c1f3676565d503b46a58edea1f52fd21..c746a146aaa6a929926bc716c27c7fe76dc1d842 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -1,8 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <math.h>
 #include "config.h"
 #include "kds_s2000w_net.h"
 #include "kds_s2000w_option_descriptors.h"

diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h
index a7fda6e6c86188eb4638b05cac67d47fd62df01e..fc08f5b9c038083da5d0c7c21dea0e9e12c9c6fa 100644 (file)
--- a/src/kds_s2000w_option_descriptors.h
+++ b/src/kds_s2000w_option_descriptors.h
@@ -7,4 +7,5 @@
 void kds_s2000w_option_descriptor_init_option_descriptors();
 void kds_s2000w_option_descriptor_free_option_descriptors();
 SANE_Option_Descriptor* kds_s2000w_option_get_descriptor(int option);
+
 #endif
\ No newline at end of file