#include "defs.h"
-#include "common/filestuff.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/scoped_fd.h"
#include "config.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
namespace selftests {
namespace scoped_fd {