-#include "messages_methods.h"
+#include <ostream> // xmlrpc-c devs have missed something :)
-#include "rpcconfig.h"
-#include "stg_message.h"
+#include "stg/message.h"
+#include "stg/common.h"
#include "utils.h"
-#include "common.h"
+#include "messages_methods.h"
+#include "rpcconfig.h"
extern const volatile time_t stgTime;