#include "daemon.h"
#include "dirs.h"
#include "openvswitch/dynamic-string.h"
-#include "json.h"
+#include "openvswitch/json.h"
#include "latch.h"
#include "openvswitch/ofpbuf.h"
#include "ovs-rcu.h"
#include "ovs-thread.h"
#include "poll-loop.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
#include "smap.h"
#include "timeval.h"
#include "openvswitch/vlog.h"