emu/debug, osd/modules/debugger/qt: Clean up #includes a bit

ajrhacker · ajrhacker · commit 83811974793d · 2024-09-30T20:49:14.000-04:00
diff --git a/src/emu/debug/debugcmd.h b/src/emu/debug/debugcmd.h
@@ -13,9 +13,6 @@
 
 #pragma once
 
-#include "debugcpu.h"
-#include "debugcon.h"
-
 #include <string_view>
 
 
diff --git a/src/emu/debug/dvbpoints.cpp b/src/emu/debug/dvbpoints.cpp
@@ -9,8 +9,9 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "debugger.h"
 #include "dvbpoints.h"
+
+#include "debugcpu.h"
 #include "points.h"
 
 #include <algorithm>
diff --git a/src/emu/debug/dvbpoints.h b/src/emu/debug/dvbpoints.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include "debugcpu.h"
 #include "debugvw.h"
 
 #include <vector>
diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp
@@ -9,10 +9,11 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "debugvw.h"
 #include "dvdisasm.h"
+
+#include "debugbuf.h"
 #include "debugcpu.h"
-#include "debugger.h"
+
 
 //**************************************************************************
 //  DEBUG VIEW DISASM SOURCE
diff --git a/src/emu/debug/dvdisasm.h b/src/emu/debug/dvdisasm.h
@@ -14,9 +14,6 @@
 #pragma once
 
 #include "debugvw.h"
-#include "debugbuf.h"
-
-#include "vecstream.h"
 
 
 //**************************************************************************
@@ -38,6 +35,9 @@ enum disasm_right_column
 //  TYPE DEFINITIONS
 //**************************************************************************
 
+// forward declaration
+class debug_disasm_buffer;
+
 // a disassembly view_source
 class debug_view_disasm_source : public debug_view_source
 {
diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp
@@ -12,7 +12,6 @@
 #include "dvmemory.h"
 
 #include "debugcpu.h"
-#include "debugger.h"
 
 #include <algorithm>
 #include <cctype>
diff --git a/src/emu/debug/dvrpoints.cpp b/src/emu/debug/dvrpoints.cpp
@@ -11,7 +11,7 @@
 #include "emu.h"
 #include "dvrpoints.h"
 
-#include "debugger.h"
+#include "debugcpu.h"
 #include "points.h"
 
 #include <algorithm>
diff --git a/src/emu/debug/dvrpoints.h b/src/emu/debug/dvrpoints.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include "debugcpu.h"
 #include "debugvw.h"
 
 #include <utility>
diff --git a/src/emu/debug/dvwpoints.cpp b/src/emu/debug/dvwpoints.cpp
@@ -11,6 +11,7 @@
 #include "emu.h"
 #include "dvwpoints.h"
 
+#include "debugcpu.h"
 #include "points.h"
 
 #include <algorithm>
diff --git a/src/emu/debug/dvwpoints.h b/src/emu/debug/dvwpoints.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include "debugcpu.h"
 #include "debugvw.h"
 
 
diff --git a/src/emu/debug/points.cpp b/src/emu/debug/points.cpp
@@ -10,8 +10,10 @@
 
 #include "emu.h"
 #include "points.h"
+
 #include "debugger.h"
 #include "debugcon.h"
+#include "debugcpu.h"
 
 
 //**************************************************************************
diff --git a/src/emu/debug/points.h b/src/emu/debug/points.h
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "debugcpu.h"
 #include "express.h"
 
 
diff --git a/src/osd/modules/debugger/qt/breakpointswindow.cpp b/src/osd/modules/debugger/qt/breakpointswindow.cpp
@@ -3,9 +3,6 @@
 #include "emu.h"
 #include "breakpointswindow.h"
 
-#include "debug/debugcon.h"
-#include "debug/debugcpu.h"
-
 #include "util/xmlfile.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp
@@ -3,6 +3,7 @@
 #include "emu.h"
 #include "dasmwindow.h"
 
+#include "debugger.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
 #include "debug/dvdisasm.h"
diff --git a/src/osd/modules/debugger/qt/logwindow.cpp b/src/osd/modules/debugger/qt/logwindow.cpp
@@ -3,10 +3,6 @@
 #include "emu.h"
 #include "logwindow.h"
 
-#include "debug/debugcon.h"
-#include "debug/debugcpu.h"
-#include "debug/dvdisasm.h"
-
 #include "util/xmlfile.h"
 
 #include <QtWidgets/QVBoxLayout>
diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp
@@ -3,6 +3,7 @@
 #include "emu.h"
 #include "mainwindow.h"
 
+#include "debugger.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
 #include "debug/dvdisasm.h"
diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp
@@ -3,6 +3,7 @@
 #include "emu.h"
 #include "memorywindow.h"
 
+#include "debugger.h"
 #include "debug/dvmemory.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
diff --git a/src/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp
@@ -9,6 +9,7 @@
 #include "logwindow.h"
 #include "memorywindow.h"
 
+#include "debugger.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
 
diff --git a/src/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h
@@ -5,8 +5,6 @@
 
 #include "../xmlconfig.h"
 
-#include "debugger.h"
-
 #include <QtWidgets/QMainWindow>
 
 #include <deque>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`
`13`	`13`	`#pragma once`
`14`	`14`
`15`		`-#include "debugcpu.h"`
`16`	`15`	`#include "debugvw.h"`
`17`	`16`
`18`	`17`