Move unused includes in header to cpp

JayXon · JayXon · commit af323313c498 · 2016-03-27T23:24:54.000-07:00
diff --git a/formats/jpeg.cpp b/formats/jpeg.cpp
@@ -1,5 +1,9 @@
 #include "jpeg.h"
 
+#include <csetjmp>  // for mozjpeg error handling
+#include <cstdio>
+
+#include "../lib/mozjpeg/jpeglib.h"
 
 const uint8_t Jpeg::header_magic[] = { 0xFF, 0xD8, 0xFF };
 bool Jpeg::keep_exif_ = false;
diff --git a/formats/jpeg.h b/formats/jpeg.h
@@ -1,14 +1,6 @@
 #ifndef JPEG_H
 #define JPEG_H
 
-#include <csetjmp>  // for mozjpeg error handling
-#include <cstdio>
-
-#ifdef _WIN32
-#define XMD_H // prevents mozjpeg to redefine INT32
-#endif
-#include "../lib/mozjpeg/jpeglib.h"
-
 #include "format.h"
 
 
diff --git a/formats/xml.cpp b/formats/xml.cpp
@@ -1,6 +1,7 @@
 #include "xml.h"
 
 #include <cstring>
+#include <functional>
 #include <iostream>
 #include <string>
 
diff --git a/formats/xml.h b/formats/xml.h
@@ -1,9 +1,6 @@
 #ifndef XML_H
 #define XML_H
 
-
-#include <functional>
-
 #include "../lib/pugixml/pugixml.hpp"
 
 #include "format.h"
