#include "gdbcmd.h"
#include "frame.h"
#include "value.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
#include <sys/types.h>
#include <fcntl.h>
#include "completer.h"
#include "ui-out.h"
#include "readline/readline.h"
-#include "common/enum-flags.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/scoped_fd.h"
#include <algorithm>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
#include "source-cache.h"
#define OPEN_MODE (O_RDONLY | O_BINARY)