Move cajun includes into the cpp files rather than headers so that only files in libaegisub include them.

Originally committed to SVN as r4473.

aegisub/libaegisub/common/mru.cpp

@@ -21,6 +21,10 @@
 #ifndef LAGI_PRE
 #include <fstream>
 #include <time.h>
+
+#include "libaegisub/cajun/reader.h"
+#include "libaegisub/cajun/writer.h"
+#include "libaegisub/cajun/elements.h"
 #endif
 
 #include "libaegisub/access.h"

aegisub/libaegisub/common/option.cpp

@@ -22,6 +22,10 @@
 #include <fstream>
 #include <sstream>
 #include <map>
+
+#include "libaegisub/cajun/reader.h"
+#include "libaegisub/cajun/writer.h"
+#include "libaegisub/cajun/elements.h"
 #endif
 
 #include "libaegisub/io.h"

aegisub/libaegisub/include/libaegisub/mru.h

@@ -21,14 +21,14 @@
 #ifndef LAGI_PRE
 #include <fstream>
 #include <map>
-
-#include "libaegisub/cajun/reader.h"
-#include "libaegisub/cajun/writer.h"
-#include "libaegisub/cajun/elements.h"
 #endif
 
 #include <libaegisub/exception.h>
 
+namespace json {
+	class Array;
+}
+
 namespace agi {
 
 DEFINE_BASE_EXCEPTION_NOINNER(MRUError,Exception)

aegisub/libaegisub/include/libaegisub/option.h

@@ -21,15 +21,16 @@
 
 #ifndef LAGI_PRE
 #include <fstream>
-
-#include "libaegisub/cajun/reader.h"
-#include "libaegisub/cajun/writer.h"
-#include "libaegisub/cajun/elements.h"
 #endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/option_value.h>
 
+namespace json {
+	class Object;
+	class UnknownElement;
+}
+
 namespace agi {
 
 DEFINE_BASE_EXCEPTION_NOINNER(OptionError,Exception)
@@ -48,13 +49,9 @@ public:
 	OptionValueMap() {};
 };
 
-
 class Options {
 	friend class PutOptionVisitor;
 
-	/// Root json::Object, used for loading.
-	json::UnknownElement config_root;
-
 	/// Internal OptionValueMap
 	OptionValueMap values;
 

aegisub/libaegisub/include/libaegisub/option_value.h

@@ -22,10 +22,6 @@
 #include <fstream>
 #include <map>
 #include <stdint.h>
-
-#include "libaegisub/cajun/reader.h"
-#include "libaegisub/cajun/writer.h"
-#include "libaegisub/cajun/elements.h"
 #endif
 
 #include <libaegisub/exception.h>