diff --git a/src/cheat/BankRomCheat.cxx b/src/cheat/BankRomCheat.cxx
index b79aa75e3..9b032ceb6 100644
--- a/src/cheat/BankRomCheat.cxx
+++ b/src/cheat/BankRomCheat.cxx
@@ -18,6 +18,8 @@
 //============================================================================
 
 #include "Console.hxx"
+#include "Cart.hxx"
+#include "OSystem.hxx"
 #include "BankRomCheat.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/cheat/Cheat.hxx b/src/cheat/Cheat.hxx
index c472ecae7..1d4465e6c 100644
--- a/src/cheat/Cheat.hxx
+++ b/src/cheat/Cheat.hxx
@@ -20,8 +20,9 @@
 #ifndef CHEAT_HXX
 #define CHEAT_HXX
 
+class OSystem;
+
 #include "StringList.hxx"
-#include "OSystem.hxx"
 #include "bspf.hxx"
 
 class Cheat
diff --git a/src/cheat/CheatCodeDialog.cxx b/src/cheat/CheatCodeDialog.cxx
index 6589c4189..32a9b8465 100644
--- a/src/cheat/CheatCodeDialog.cxx
+++ b/src/cheat/CheatCodeDialog.cxx
@@ -24,6 +24,7 @@
 
 #include "bspf.hxx"
 
+#include "Cheat.hxx"
 #include "CheatManager.hxx"
 #include "CheckListWidget.hxx"
 #include "DialogContainer.hxx"
diff --git a/src/cheat/CheatCodeDialog.hxx b/src/cheat/CheatCodeDialog.hxx
index 5b22cd72c..6808b48b2 100644
--- a/src/cheat/CheatCodeDialog.hxx
+++ b/src/cheat/CheatCodeDialog.hxx
@@ -25,19 +25,16 @@
 
 class DialogContainer;
 class CommandSender;
+class Widget;
 class ButtonWidget;
 class StaticTextWidget;
 class CheckListWidget;
+class EditTextWidget;
 class InputTextDialog;
 class OptionsDialog;
+class OSystem;
 
-#include "OSystem.hxx"
 #include "Dialog.hxx"
-#include "Widget.hxx"
-#include "CheatManager.hxx"
-#include "EditTextWidget.hxx"
-#include "Props.hxx"
-#include "bspf.hxx"
 
 class CheatCodeDialog : public Dialog
 {
diff --git a/src/cheat/CheatManager.cxx b/src/cheat/CheatManager.cxx
index a37f1b25a..b26147957 100644
--- a/src/cheat/CheatManager.cxx
+++ b/src/cheat/CheatManager.cxx
@@ -17,6 +17,7 @@
 // $Id$
 //============================================================================
 
+#include <fstream>
 #include <sstream>
 
 #include "OSystem.hxx"
diff --git a/src/cheat/CheatManager.hxx b/src/cheat/CheatManager.hxx
index 12a719cb7..eff8e3d60 100644
--- a/src/cheat/CheatManager.hxx
+++ b/src/cheat/CheatManager.hxx
@@ -22,12 +22,12 @@
 
 #include <map>
 
-#include "OSystem.hxx"
+class Cheat;
+class OSystem;
+
 #include "bspf.hxx"
 #include "Array.hxx"
 
-#include "Cheat.hxx"
-
 typedef Common::Array<Cheat*> CheatList;
 typedef map<string,string> CheatCodeMap;
 
diff --git a/src/cheat/CheetahCheat.cxx b/src/cheat/CheetahCheat.cxx
index 6ec090f97..0b04c75ad 100644
--- a/src/cheat/CheetahCheat.cxx
+++ b/src/cheat/CheetahCheat.cxx
@@ -18,6 +18,8 @@
 //============================================================================
 
 #include "Console.hxx"
+#include "Cart.hxx"
+#include "OSystem.hxx"
 #include "CheetahCheat.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/cheat/RamCheat.cxx b/src/cheat/RamCheat.cxx
index 2725cdfcc..43b5a77dd 100644
--- a/src/cheat/RamCheat.cxx
+++ b/src/cheat/RamCheat.cxx
@@ -19,6 +19,7 @@
 
 #include "Console.hxx"
 #include "System.hxx"
+#include "OSystem.hxx"
 #include "CheatManager.hxx"
 
 #include "RamCheat.hxx"
diff --git a/src/common/FrameBufferGL.cxx b/src/common/FrameBufferGL.cxx
index 20800b426..6abd272bc 100644
--- a/src/common/FrameBufferGL.cxx
+++ b/src/common/FrameBufferGL.cxx
@@ -23,6 +23,7 @@
 #include <SDL_syswm.h>
 #include <sstream>
 #include <time.h>
+#include <fstream>
 
 #include "bspf.hxx"
 
diff --git a/src/common/PNGLibrary.cxx b/src/common/PNGLibrary.cxx
index 6015e89a0..1ebd9fdc8 100644
--- a/src/common/PNGLibrary.cxx
+++ b/src/common/PNGLibrary.cxx
@@ -20,6 +20,7 @@
 #include <fstream>
 #include <cmath>
 
+#include "FrameBuffer.hxx"
 #include "bspf.hxx"
 #include "PNGLibrary.hxx"
 
diff --git a/src/common/PNGLibrary.hxx b/src/common/PNGLibrary.hxx
index fdb737067..62c81a3f6 100644
--- a/src/common/PNGLibrary.hxx
+++ b/src/common/PNGLibrary.hxx
@@ -22,9 +22,10 @@
 
 #include <png.h>
 
+class FrameBuffer;
+class FBSurface;
+
 #include "bspf.hxx"
-#include "FrameBuffer.hxx"
-#include "StringList.hxx"
 
 /**
   This class implements a thin wrapper around the libpng library, and
diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index c3d1b0e64..1328b33db 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -20,8 +20,11 @@
 #include "bspf.hxx"
 #include "Array.hxx"
 #include "System.hxx"
+#include "FSNode.hxx"
 #include "DiStella.hxx"
+#include "Debugger.hxx"
 #include "CpuDebug.hxx"
+#include "OSystem.hxx"
 #include "Settings.hxx"
 #include "CartDebug.hxx"
 
diff --git a/src/debugger/CartDebug.hxx b/src/debugger/CartDebug.hxx
index 72d212639..76ea639ea 100644
--- a/src/debugger/CartDebug.hxx
+++ b/src/debugger/CartDebug.hxx
@@ -21,7 +21,6 @@
 #define CART_DEBUG_HXX
 
 class Settings;
-class System;
 
 #include <map>
 #include <set>
@@ -30,10 +29,11 @@ class System;
 #include "bspf.hxx"
 #include "Array.hxx"
 #include "Cart.hxx"
-#include "StringList.hxx"
 #include "DebuggerSystem.hxx"
+#include "System.hxx"
 
 // pointer types for CartDebug instance methods
+class CartDebug;
 typedef int (CartDebug::*CARTDEBUG_INT_METHOD)();
 
 // call the pointed-to method on the (global) CPU debugger object.
diff --git a/src/debugger/CpuDebug.cxx b/src/debugger/CpuDebug.cxx
index 112e29b71..e88519d53 100644
--- a/src/debugger/CpuDebug.cxx
+++ b/src/debugger/CpuDebug.cxx
@@ -21,6 +21,7 @@
 
 #include "Array.hxx"
 #include "M6502.hxx"
+#include "Debugger.hxx"
 #include "CartDebug.hxx"
 #include "TIADebug.hxx"
 
diff --git a/src/debugger/CpuDebug.hxx b/src/debugger/CpuDebug.hxx
index 04a3860af..0881c029e 100644
--- a/src/debugger/CpuDebug.hxx
+++ b/src/debugger/CpuDebug.hxx
@@ -23,6 +23,7 @@
 class EquateList;
 
 #include "Array.hxx"
+#include "M6502.hxx"
 #include "System.hxx"
 #include "DebuggerSystem.hxx"
 
diff --git a/src/debugger/Debugger.cxx b/src/debugger/Debugger.cxx
index 8098b7db3..388781859 100644
--- a/src/debugger/Debugger.cxx
+++ b/src/debugger/Debugger.cxx
@@ -37,6 +37,7 @@
 #include "System.hxx"
 #include "M6502.hxx"
 #include "Cart.hxx"
+#include "TIA.hxx"
 
 #include "CartDebug.hxx"
 #include "CpuDebug.hxx"
@@ -50,7 +51,7 @@
 
 #include "RomWidget.hxx"
 #include "Expression.hxx"
-
+#include "PackedBitArray.hxx"
 #include "YaccParser.hxx"
 
 #include "Debugger.hxx"
diff --git a/src/debugger/Debugger.hxx b/src/debugger/Debugger.hxx
index db6f9cca5..f5a38dab1 100644
--- a/src/debugger/Debugger.hxx
+++ b/src/debugger/Debugger.hxx
@@ -22,11 +22,11 @@
 
 class OSystem;
 class Console;
-class System;
 class CartDebug;
 class CpuDebug;
 class RiotDebug;
 class TIADebug;
+class M6502;
 class TiaInfoWidget;
 class TiaOutputWidget;
 class TiaZoomWidget;
@@ -34,15 +34,16 @@ class EditTextWidget;
 class RomWidget;
 class Expression;
 class Serializer;
+class PackedBitArray;
+class PromptWidget;
+class ButtonWidget;
 
 #include <map>
 
 #include "Array.hxx"
 #include "DialogContainer.hxx"
-#include "M6502.hxx"
 #include "DebuggerParser.hxx"
-#include "PackedBitArray.hxx"
-#include "PromptWidget.hxx"
+#include "System.hxx"
 #include "Rect.hxx"
 #include "Stack.hxx"
 #include "bspf.hxx"
diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx
index f1b485907..4fbfd5d07 100644
--- a/src/debugger/DebuggerParser.cxx
+++ b/src/debugger/DebuggerParser.cxx
@@ -31,10 +31,13 @@
 #include "M6502.hxx"
 #include "Expression.hxx"
 #include "FSNode.hxx"
+#include "PromptWidget.hxx"
 #include "RomWidget.hxx"
 #include "ProgressDialog.hxx"
+#include "PackedBitArray.hxx"
 
 #ifdef CHEATCODE_SUPPORT
+  #include "Cheat.hxx"
   #include "CheatManager.hxx"
 #endif
 
diff --git a/src/debugger/DebuggerParser.hxx b/src/debugger/DebuggerParser.hxx
index ef4e15ec9..0d51586d4 100644
--- a/src/debugger/DebuggerParser.hxx
+++ b/src/debugger/DebuggerParser.hxx
@@ -23,12 +23,12 @@
 #include <sstream>
 
 class Debugger;
+class FilesystemNode;
 struct Command;
 
 #include "bspf.hxx"
 #include "Array.hxx"
 #include "FrameBuffer.hxx"
-#include "FSNode.hxx"
 
 typedef enum {
 	kBASE_16,
diff --git a/src/debugger/DebuggerSystem.hxx b/src/debugger/DebuggerSystem.hxx
index 2e88ef7c8..13c4a7743 100644
--- a/src/debugger/DebuggerSystem.hxx
+++ b/src/debugger/DebuggerSystem.hxx
@@ -20,7 +20,8 @@
 #ifndef DEBUGGER_SYSTEM_HXX
 #define DEBUGGER_SYSTEM_HXX
 
-#include "Debugger.hxx"
+class Debugger;
+
 #include "Console.hxx"
 
 /**
diff --git a/src/debugger/DiStella.hxx b/src/debugger/DiStella.hxx
index 95bafc4f7..42cea1c57 100644
--- a/src/debugger/DiStella.hxx
+++ b/src/debugger/DiStella.hxx
@@ -25,8 +25,8 @@
 
 #include "Array.hxx"
 #include "bspf.hxx"
-
 #include "CartDebug.hxx"
+#include "DebuggerParser.hxx"
 
 /**
   This class is a wrapper around the Distella code.  Much of the code remains
diff --git a/src/debugger/RiotDebug.cxx b/src/debugger/RiotDebug.cxx
index 01009b8a7..739edebfa 100644
--- a/src/debugger/RiotDebug.cxx
+++ b/src/debugger/RiotDebug.cxx
@@ -20,6 +20,7 @@
 #include <sstream>
 
 #include "System.hxx"
+#include "M6532.hxx"
 #include "Debugger.hxx"
 #include "Switches.hxx"
 
diff --git a/src/debugger/TIADebug.cxx b/src/debugger/TIADebug.cxx
index 9e705999a..16c30345e 100644
--- a/src/debugger/TIADebug.cxx
+++ b/src/debugger/TIADebug.cxx
@@ -19,6 +19,7 @@
 
 #include "System.hxx"
 #include "Debugger.hxx"
+#include "TIA.hxx"
 
 #include "TIADebug.hxx"
 
diff --git a/src/debugger/TIADebug.hxx b/src/debugger/TIADebug.hxx
index 0a1981561..d38424947 100644
--- a/src/debugger/TIADebug.hxx
+++ b/src/debugger/TIADebug.hxx
@@ -22,13 +22,14 @@
 
 class Debugger;
 class TiaDebug;
+class TIA;
 
 #include "Array.hxx"
 #include "DebuggerSystem.hxx"
-#include "TIA.hxx"
 
 // pointer types for TIADebug instance methods
 // (used by TiaMethodExpression)
+class TIADebug;
 typedef int (TIADebug::*TIADEBUG_INT_METHOD)();
 
 // call the pointed-to method on the (global) debugger object.
diff --git a/src/debugger/gui/ColorWidget.hxx b/src/debugger/gui/ColorWidget.hxx
index 60e9145ce..848d49273 100644
--- a/src/debugger/gui/ColorWidget.hxx
+++ b/src/debugger/gui/ColorWidget.hxx
@@ -29,8 +29,6 @@ class GuiObject;
 #include "Widget.hxx"
 #include "Command.hxx"
 
-#include "bspf.hxx"
-
 /**
   Displays a color from the TIA palette.  This class will eventually
   be expanded with a TIA palette table, to set the color visually.
diff --git a/src/debugger/gui/CpuWidget.hxx b/src/debugger/gui/CpuWidget.hxx
index 52245db52..7ab183e31 100644
--- a/src/debugger/gui/CpuWidget.hxx
+++ b/src/debugger/gui/CpuWidget.hxx
@@ -25,14 +25,13 @@
 
 class GuiObject;
 class ButtonWidget;
+class DataGridWidget;
+class DataGridOpsWidget;
 class EditTextWidget;
 class ToggleBitWidget;
 
-#include "Array.hxx"
 #include "Widget.hxx"
 #include "Command.hxx"
-#include "DataGridWidget.hxx"
-
 
 class CpuWidget : public Widget, public CommandSender
 {
diff --git a/src/debugger/gui/DataGridOpsWidget.hxx b/src/debugger/gui/DataGridOpsWidget.hxx
index 5c23eeca2..772a4de35 100644
--- a/src/debugger/gui/DataGridOpsWidget.hxx
+++ b/src/debugger/gui/DataGridOpsWidget.hxx
@@ -23,7 +23,6 @@
 #ifndef DATA_GRID_OPS_WIDGET_HXX
 #define DATA_GRID_OPS_WIDGET_HXX
 
-#include "GuiObject.hxx"
 #include "Widget.hxx"
 #include "Command.hxx"
 
diff --git a/src/debugger/gui/DataGridWidget.cxx b/src/debugger/gui/DataGridWidget.cxx
index f08f1485f..876a5e39a 100644
--- a/src/debugger/gui/DataGridWidget.cxx
+++ b/src/debugger/gui/DataGridWidget.cxx
@@ -26,7 +26,9 @@
 #include "Debugger.hxx"
 #include "FrameBuffer.hxx"
 #include "DataGridWidget.hxx"
+#include "DataGridOpsWidget.hxx"
 #include "RamWidget.hxx"
+#include "ScrollBarWidget.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 DataGridWidget::DataGridWidget(GuiObject* boss, const GUI::Font& font,
@@ -593,6 +595,12 @@ GUI::Rect DataGridWidget::getEditRect() const
   return r;
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+int DataGridWidget::getWidth() const
+{
+  return _w + (_scrollBar ? kScrollBarWidth : 0);
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void DataGridWidget::startEditMode()
 {
diff --git a/src/debugger/gui/DataGridWidget.hxx b/src/debugger/gui/DataGridWidget.hxx
index c8e1d529c..ffa663de5 100644
--- a/src/debugger/gui/DataGridWidget.hxx
+++ b/src/debugger/gui/DataGridWidget.hxx
@@ -23,16 +23,15 @@
 #ifndef DATA_GRID_WIDGET_HXX
 #define DATA_GRID_WIDGET_HXX
 
-#include "GuiObject.hxx"
+class DataGridOpsWidget;
+class ScrollBarWidget;
+
 #include "Widget.hxx"
 #include "Command.hxx"
 #include "Debugger.hxx"
-#include "StringList.hxx"
 #include "EditableWidget.hxx"
 #include "Array.hxx"
 #include "Rect.hxx"
-#include "DataGridOpsWidget.hxx"
-#include "ScrollBarWidget.hxx"
 
 // Some special commands
 enum {
@@ -82,7 +81,7 @@ class DataGridWidget : public EditableWidget
     virtual bool wantsFocus() { return true; }
 
     // Account for the extra width of embedded scrollbar
-    virtual int getWidth() const { return _w + (_scrollBar ? kScrollBarWidth : 0); }
+    virtual int getWidth() const;
 
     void startEditMode();
     void endEditMode();
diff --git a/src/debugger/gui/DebuggerDialog.hxx b/src/debugger/gui/DebuggerDialog.hxx
index fb90a3472..f2ef10544 100644
--- a/src/debugger/gui/DebuggerDialog.hxx
+++ b/src/debugger/gui/DebuggerDialog.hxx
@@ -28,6 +28,7 @@ class OSystem;
 class DialogContainer;
 class ButtonWidget;
 class CpuWidget;
+class PromptWidget;
 class RamWidget;
 class RomWidget;
 class TabWidget;
@@ -37,7 +38,6 @@ class TiaOutputWidget;
 class TiaZoomWidget;
 
 #include "Dialog.hxx"
-#include "PromptWidget.hxx"
 
 class DebuggerDialog : public Dialog
 {
diff --git a/src/debugger/gui/PromptWidget.cxx b/src/debugger/gui/PromptWidget.cxx
index a5a446595..e29b8fd3a 100644
--- a/src/debugger/gui/PromptWidget.cxx
+++ b/src/debugger/gui/PromptWidget.cxx
@@ -512,6 +512,12 @@ void PromptWidget::loadConfig()
   }
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+int PromptWidget::getWidth() const
+{
+  return _w + kScrollBarWidth;
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void PromptWidget::specialKeys(int keycode)
 {
diff --git a/src/debugger/gui/PromptWidget.hxx b/src/debugger/gui/PromptWidget.hxx
index 9dc1a5c32..8c948577d 100644
--- a/src/debugger/gui/PromptWidget.hxx
+++ b/src/debugger/gui/PromptWidget.hxx
@@ -25,10 +25,10 @@
 
 #include <stdarg.h>
 
-#include "GuiObject.hxx"
+class ScrollBarWidget;
+
 #include "Widget.hxx"
 #include "Command.hxx"
-#include "ScrollBarWidget.hxx"
 #include "bspf.hxx"
 
 class PromptWidget : public Widget, public CommandSender
@@ -77,7 +77,7 @@ class PromptWidget : public Widget, public CommandSender
     void handleCommand(CommandSender* sender, int cmd, int data, int id);
 
     // Account for the extra width of embedded scrollbar
-    virtual int getWidth() const { return _w + kScrollBarWidth; }
+    virtual int getWidth() const;
 
     virtual bool wantsFocus() { return true; }
 
diff --git a/src/debugger/gui/RamWidget.cxx b/src/debugger/gui/RamWidget.cxx
index 1efe48e4c..ce0a4cc8b 100644
--- a/src/debugger/gui/RamWidget.cxx
+++ b/src/debugger/gui/RamWidget.cxx
@@ -252,6 +252,12 @@ void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
   }
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void RamWidget::setOpsWidget(DataGridOpsWidget* w)
+{
+  myRamGrid->setOpsWidget(w);
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RamWidget::loadConfig()
 {
diff --git a/src/debugger/gui/RamWidget.hxx b/src/debugger/gui/RamWidget.hxx
index 8d4d4728f..9910bdc83 100644
--- a/src/debugger/gui/RamWidget.hxx
+++ b/src/debugger/gui/RamWidget.hxx
@@ -26,14 +26,13 @@
 class GuiObject;
 class InputTextDialog;
 class ButtonWidget;
+class DataGridOpsWidget;
 class EditTextWidget;
 class StaticTextWidget;
 
 #include "Array.hxx"
 #include "Widget.hxx"
 #include "Command.hxx"
-#include "DataGridWidget.hxx"
-
 
 class RamWidget : public Widget, public CommandSender
 {
@@ -44,7 +43,7 @@ class RamWidget : public Widget, public CommandSender
     void handleCommand(CommandSender* sender, int cmd, int data, int id);
 
     void loadConfig();
-    void setOpsWidget(DataGridOpsWidget* w) { myRamGrid->setOpsWidget(w); }
+    void setOpsWidget(DataGridOpsWidget* w);
 
   private:
     void fillGrid(bool updateOld);
diff --git a/src/debugger/gui/RiotWidget.hxx b/src/debugger/gui/RiotWidget.hxx
index 437733228..82fa73a2d 100644
--- a/src/debugger/gui/RiotWidget.hxx
+++ b/src/debugger/gui/RiotWidget.hxx
@@ -30,7 +30,6 @@ class PopUpWidget;
 class ToggleBitWidget;
 
 #include "Array.hxx"
-#include "Widget.hxx"
 #include "Command.hxx"
 
 class RiotWidget : public Widget, public CommandSender
diff --git a/src/debugger/gui/RomListWidget.cxx b/src/debugger/gui/RomListWidget.cxx
index 1c1374799..2d0d3c390 100644
--- a/src/debugger/gui/RomListWidget.cxx
+++ b/src/debugger/gui/RomListWidget.cxx
@@ -23,6 +23,7 @@
 #include "bspf.hxx"
 #include "Debugger.hxx"
 #include "ContextMenu.hxx"
+#include "PackedBitArray.hxx"
 #include "Widget.hxx"
 #include "ScrollBarWidget.hxx"
 #include "RomListWidget.hxx"
diff --git a/src/debugger/gui/RomListWidget.hxx b/src/debugger/gui/RomListWidget.hxx
index 166546b64..53fb8edfa 100644
--- a/src/debugger/gui/RomListWidget.hxx
+++ b/src/debugger/gui/RomListWidget.hxx
@@ -26,10 +26,9 @@
 class ContextMenu;
 class ScrollBarWidget;
 class PackedBitArray;
+class CheckListWidget;
 
 #include "Array.hxx"
-#include "StringList.hxx"
-#include "CheckListWidget.hxx"
 #include "CartDebug.hxx"
 #include "EditableWidget.hxx"
 
diff --git a/src/debugger/gui/RomWidget.hxx b/src/debugger/gui/RomWidget.hxx
index ea5dbfaa5..1b7de1423 100644
--- a/src/debugger/gui/RomWidget.hxx
+++ b/src/debugger/gui/RomWidget.hxx
@@ -43,7 +43,7 @@ class RomWidget : public Widget, public CommandSender
     virtual ~RomWidget();
 
     void invalidate(bool forcereload = true)
-	{ myListIsDirty = true; if(forcereload) loadConfig(); }
+    { myListIsDirty = true; if(forcereload) loadConfig(); }
 
     void scrollTo(int line) { myRomList->setSelected(line); }
     void handleCommand(CommandSender* sender, int cmd, int data, int id);
diff --git a/src/debugger/gui/TiaOutputWidget.cxx b/src/debugger/gui/TiaOutputWidget.cxx
index e44e470ea..3be474a8a 100644
--- a/src/debugger/gui/TiaOutputWidget.cxx
+++ b/src/debugger/gui/TiaOutputWidget.cxx
@@ -31,6 +31,7 @@
 #include "Debugger.hxx"
 #include "DebuggerParser.hxx"
 #include "TIADebug.hxx"
+#include "TIA.hxx"
 
 #include "TiaOutputWidget.hxx"
 
diff --git a/src/debugger/gui/TiaZoomWidget.cxx b/src/debugger/gui/TiaZoomWidget.cxx
index 2d3dc2c80..a5a29f87a 100644
--- a/src/debugger/gui/TiaZoomWidget.cxx
+++ b/src/debugger/gui/TiaZoomWidget.cxx
@@ -22,6 +22,7 @@
 
 #include "OSystem.hxx"
 #include "Console.hxx"
+#include "TIA.hxx"
 #include "FrameBuffer.hxx"
 #include "Widget.hxx"
 #include "GuiObject.hxx"
diff --git a/src/debugger/gui/TogglePixelWidget.hxx b/src/debugger/gui/TogglePixelWidget.hxx
index 15603c1ec..c5c3ceacb 100644
--- a/src/debugger/gui/TogglePixelWidget.hxx
+++ b/src/debugger/gui/TogglePixelWidget.hxx
@@ -23,7 +23,6 @@
 #ifndef TOGGLE_PIXEL_WIDGET_HXX
 #define TOGGLE_PIXEL_WIDGET_HXX
 
-#include "FrameBuffer.hxx"
 #include "ToggleWidget.hxx"
 
 /* TogglePixelWidget */
diff --git a/src/debugger/gui/ToggleWidget.hxx b/src/debugger/gui/ToggleWidget.hxx
index 965263dbd..b36c0b747 100644
--- a/src/debugger/gui/ToggleWidget.hxx
+++ b/src/debugger/gui/ToggleWidget.hxx
@@ -23,7 +23,6 @@
 #ifndef TOGGLE_WIDGET_HXX
 #define TOGGLE_WIDGET_HXX
 
-#include "GuiObject.hxx"
 #include "Widget.hxx"
 #include "Command.hxx"
 #include "Array.hxx"
diff --git a/src/emucore/Booster.hxx b/src/emucore/Booster.hxx
index 9afec173d..5575fa5f0 100644
--- a/src/emucore/Booster.hxx
+++ b/src/emucore/Booster.hxx
@@ -20,7 +20,6 @@
 #ifndef BOOSTERGRIP_HXX
 #define BOOSTERGRIP_HXX
 
-#include "bspf.hxx"
 #include "Control.hxx"
 #include "Event.hxx"
 
diff --git a/src/emucore/CartAR.hxx b/src/emucore/CartAR.hxx
index 8a8217c51..064079fe5 100644
--- a/src/emucore/CartAR.hxx
+++ b/src/emucore/CartAR.hxx
@@ -25,7 +25,6 @@ class System;
 
 #include "bspf.hxx"
 #include "Cart.hxx"
-#include "Settings.hxx"
 
 /**
   This is the cartridge class for Arcadia (aka Starpath) Supercharger 
diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index 66f431062..f5e0d16cb 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -25,8 +25,8 @@
 #include "AtariVox.hxx"
 #include "Booster.hxx"
 #include "Cart.hxx"
-#include "Console.hxx"
 #include "Control.hxx"
+#include "Cart.hxx"
 #include "Driving.hxx"
 #include "Event.hxx"
 #include "EventHandler.hxx"
@@ -61,6 +61,8 @@
   #include "CheatManager.hxx"
 #endif
 
+#include "Console.hxx"
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
   : myOSystem(osystem),
diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx
index c21fcaa9f..469200762 100644
--- a/src/emucore/Console.hxx
+++ b/src/emucore/Console.hxx
@@ -25,15 +25,14 @@ class Event;
 class Switches;
 class System;
 class TIA;
+class M6532;
+class Cartridge;
 
 #include "bspf.hxx"
 #include "Control.hxx"
 #include "Props.hxx"
-#include "TIA.hxx"
-#include "Cart.hxx"
+#include "TIATables.hxx"
 #include "FrameBuffer.hxx"
-#include "M6532.hxx"
-#include "AtariVox.hxx"
 #include "Serializable.hxx"
 
 /**
@@ -87,7 +86,7 @@ class Console : public Serializable
 
       @return The specified controller
     */
-    Controller& controller(Controller::Jack jack) const
+    inline Controller& controller(Controller::Jack jack) const
     {
       return (jack == Controller::Left) ? *myControllers[0] : *myControllers[1];
     }
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index e1191cd50..15aafe66c 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -45,6 +45,7 @@
 #include "EventHandler.hxx"
 
 #ifdef CHEATCODE_SUPPORT
+  #include "Cheat.hxx"
   #include "CheatManager.hxx"
 #endif
 #ifdef DEBUGGER_SUPPORT
diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index dff2927c4..27b6b8379 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -26,14 +26,13 @@ class Console;
 class OSystem;
 class DialogContainer;
 class EventMappingWidget;
+class StringMap;
+class StringList;
 
 #include "Array.hxx"
 #include "Event.hxx"
-#include "Control.hxx"
-#include "StringList.hxx"
 #include "bspf.hxx"
 
-
 enum MouseButton {
   EVENT_LBUTTONDOWN,
   EVENT_LBUTTONUP,
diff --git a/src/emucore/FrameBuffer.hxx b/src/emucore/FrameBuffer.hxx
index 7f48eb189..07abfb75e 100644
--- a/src/emucore/FrameBuffer.hxx
+++ b/src/emucore/FrameBuffer.hxx
@@ -26,6 +26,7 @@
 class FBSurface;
 class OSystem;
 class Console;
+class Settings;
 
 namespace GUI {
   class Font;
@@ -33,8 +34,8 @@ namespace GUI {
 }
 
 #include "EventHandler.hxx"
-#include "Settings.hxx"
 #include "Rect.hxx"
+#include "StringList.hxx"
 #include "bspf.hxx"
 
 // Different types of framebuffer derived objects
diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx
index 89b0d7f2b..96b516a9a 100644
--- a/src/emucore/M6502.cxx
+++ b/src/emucore/M6502.cxx
@@ -24,6 +24,7 @@
   #include "Debugger.hxx"
   #include "Expression.hxx"
   #include "CartDebug.hxx"
+  #include "PackedBitArray.hxx"
 
   // Flags for disassembly types
   #define DISASM_SKIP  CartDebug::SKIP
diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx
index 7a6e52d84..693d329ba 100644
--- a/src/emucore/OSystem.cxx
+++ b/src/emucore/OSystem.cxx
@@ -30,6 +30,7 @@
 #include "bspf.hxx"
 
 #include "MediaFactory.hxx"
+#include "Sound.hxx"
 
 #ifdef DEBUGGER_SUPPORT
   #include "Debugger.hxx"
@@ -51,6 +52,7 @@
 #include "FSNode.hxx"
 #include "unzip.h"
 #include "MD5.hxx"
+#include "Cart.hxx"
 #include "Settings.hxx"
 #include "PropsSet.hxx"
 #include "EventHandler.hxx"
diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx
index 369d1d2f7..6721e90c7 100644
--- a/src/emucore/OSystem.hxx
+++ b/src/emucore/OSystem.hxx
@@ -40,7 +40,6 @@ namespace GUI {
 }
 
 #include "Array.hxx"
-#include "EventHandler.hxx"
 #include "FrameBuffer.hxx"
 #include "bspf.hxx"
 
diff --git a/src/emucore/StateManager.cxx b/src/emucore/StateManager.cxx
index 565935575..4956ce2ec 100644
--- a/src/emucore/StateManager.cxx
+++ b/src/emucore/StateManager.cxx
@@ -22,6 +22,7 @@
 #include "OSystem.hxx"
 #include "Settings.hxx"
 #include "Console.hxx"
+#include "Cart.hxx"
 #include "Control.hxx"
 #include "Switches.hxx"
 #include "System.hxx"
diff --git a/src/emucore/TIA.hxx b/src/emucore/TIA.hxx
index a3703bb88..cd41996de 100644
--- a/src/emucore/TIA.hxx
+++ b/src/emucore/TIA.hxx
@@ -22,9 +22,9 @@
 
 class Console;
 class Settings;
+class Sound;
 
 #include "bspf.hxx"
-#include "Sound.hxx"
 #include "Device.hxx"
 #include "System.hxx"
 #include "TIATables.hxx"
diff --git a/src/gui/AudioDialog.hxx b/src/gui/AudioDialog.hxx
index 13a2740e2..17ee82203 100644
--- a/src/gui/AudioDialog.hxx
+++ b/src/gui/AudioDialog.hxx
@@ -30,8 +30,8 @@ class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
 class CheckboxWidget;
+class OSystem;
 
-#include "OSystem.hxx"
 #include "bspf.hxx"
 
 class AudioDialog : public Dialog
diff --git a/src/gui/ComboDialog.cxx b/src/gui/ComboDialog.cxx
index 00eab71dd..e3c5b6e9e 100644
--- a/src/gui/ComboDialog.cxx
+++ b/src/gui/ComboDialog.cxx
@@ -23,6 +23,7 @@
 
 #include "Control.hxx"
 #include "Dialog.hxx"
+#include "DialogContainer.hxx"
 #include "EventHandler.hxx"
 #include "OSystem.hxx"
 #include "EditTextWidget.hxx"
diff --git a/src/gui/ComboDialog.hxx b/src/gui/ComboDialog.hxx
index 9bcd522ce..e539ce525 100644
--- a/src/gui/ComboDialog.hxx
+++ b/src/gui/ComboDialog.hxx
@@ -23,10 +23,10 @@
 class PopUpWidget;
 class EditTextWidget;
 class StaticTextWidget;
+class StringMap;
+class OSystem;
 
 #include "Dialog.hxx"
-#include "DialogContainer.hxx"
-#include "OSystem.hxx"
 #include "bspf.hxx"
 
 class ComboDialog : public Dialog
diff --git a/src/gui/CommandDialog.cxx b/src/gui/CommandDialog.cxx
index edb987229..4bb00f227 100644
--- a/src/gui/CommandDialog.cxx
+++ b/src/gui/CommandDialog.cxx
@@ -21,6 +21,7 @@
 //============================================================================
 
 #include "Console.hxx"
+#include "TIA.hxx"
 #include "Switches.hxx"
 #include "DialogContainer.hxx"
 #include "Dialog.hxx"
diff --git a/src/gui/CommandDialog.hxx b/src/gui/CommandDialog.hxx
index 9b290a6a7..f5c84b045 100644
--- a/src/gui/CommandDialog.hxx
+++ b/src/gui/CommandDialog.hxx
@@ -26,8 +26,8 @@
 class Properties;
 class CommandSender;
 class DialogContainer;
+class OSystem;
 
-#include "OSystem.hxx"
 #include "Dialog.hxx"
 
 class CommandDialog : public Dialog
diff --git a/src/gui/ContextMenu.hxx b/src/gui/ContextMenu.hxx
index 7f0a3233c..a5292a441 100644
--- a/src/gui/ContextMenu.hxx
+++ b/src/gui/ContextMenu.hxx
@@ -24,8 +24,6 @@
 #define CONTEXT_MENU_HXX
 
 #include "bspf.hxx"
-
-#include "Array.hxx"
 #include "Command.hxx"
 #include "Dialog.hxx"
 
diff --git a/src/gui/FileSnapDialog.hxx b/src/gui/FileSnapDialog.hxx
index 6380f3c38..57ca85f0d 100644
--- a/src/gui/FileSnapDialog.hxx
+++ b/src/gui/FileSnapDialog.hxx
@@ -35,7 +35,6 @@ class StaticTextWidget;
 
 #include "Dialog.hxx"
 #include "Command.hxx"
-#include "FSNode.hxx"
 
 class FileSnapDialog : public Dialog, public CommandSender
 {
diff --git a/src/gui/GameInfoDialog.hxx b/src/gui/GameInfoDialog.hxx
index b836282b6..30618fcd5 100644
--- a/src/gui/GameInfoDialog.hxx
+++ b/src/gui/GameInfoDialog.hxx
@@ -31,11 +31,9 @@ class StaticTextWidget;
 class TabWidget;
 class SliderWidget;
 
-#include "Array.hxx"
 #include "Dialog.hxx"
 #include "Command.hxx"
 #include "Props.hxx"
-#include "StringList.hxx"
 
 class GameInfoDialog : public Dialog, public CommandSender
 {
diff --git a/src/gui/GlobalPropsDialog.hxx b/src/gui/GlobalPropsDialog.hxx
index f6389ed21..2ebb51d90 100644
--- a/src/gui/GlobalPropsDialog.hxx
+++ b/src/gui/GlobalPropsDialog.hxx
@@ -27,8 +27,8 @@ class CommandSender;
 class DialogContainer;
 class CheckboxWidget;
 class PopUpWidget;
+class OSystem;
 
-#include "OSystem.hxx"
 #include "Dialog.hxx"
 #include "bspf.hxx"
 
diff --git a/src/gui/HelpDialog.hxx b/src/gui/HelpDialog.hxx
index 5b2f0a527..effb3efad 100644
--- a/src/gui/HelpDialog.hxx
+++ b/src/gui/HelpDialog.hxx
@@ -27,9 +27,9 @@ class DialogContainer;
 class CommandSender;
 class ButtonWidget;
 class StaticTextWidget;
+class OSystem;
 
-#include "OSystem.hxx"
-#include "Props.hxx"
+#include "Dialog.hxx"
 #include "bspf.hxx"
 
 class HelpDialog : public Dialog
diff --git a/src/gui/LauncherFilterDialog.hxx b/src/gui/LauncherFilterDialog.hxx
index b19f09c6b..993c7da74 100644
--- a/src/gui/LauncherFilterDialog.hxx
+++ b/src/gui/LauncherFilterDialog.hxx
@@ -27,11 +27,11 @@ class CommandSender;
 class DialogContainer;
 class CheckboxWidget;
 class PopUpWidget;
+class OSystem;
+class StringList;
 
-#include "OSystem.hxx"
 #include "Dialog.hxx"
 #include "Settings.hxx"
-#include "StringList.hxx"
 #include "bspf.hxx"
 
 class LauncherFilterDialog : public Dialog, public CommandSender
diff --git a/src/gui/ListWidget.hxx b/src/gui/ListWidget.hxx
index f15df7c62..ae3270929 100644
--- a/src/gui/ListWidget.hxx
+++ b/src/gui/ListWidget.hxx
@@ -23,14 +23,15 @@
 #ifndef LIST_WIDGET_HXX
 #define LIST_WIDGET_HXX
 
-#include "GuiObject.hxx"
+class GuiObject;
+class StringList;
+
 #include "Widget.hxx"
 #include "Command.hxx"
 #include "EditableWidget.hxx"
 #include "ScrollBarWidget.hxx"
 #include "Rect.hxx"
 
-class StringList;
 
 // Some special commands
 enum {
diff --git a/src/gui/ProgressDialog.hxx b/src/gui/ProgressDialog.hxx
index 4b5403fe6..cd8defd54 100644
--- a/src/gui/ProgressDialog.hxx
+++ b/src/gui/ProgressDialog.hxx
@@ -23,10 +23,10 @@
 #ifndef PROGRESS_DIALOG_HXX
 #define PROGRESS_DIALOG_HXX
 
+class GuiObject;
 class StaticTextWidget;
 class SliderWidget;
 
-#include "GuiObject.hxx"
 #include "bspf.hxx"
 
 class ProgressDialog : public Dialog
diff --git a/src/gui/ScrollBarWidget.hxx b/src/gui/ScrollBarWidget.hxx
index 7eb65124e..3b5b630fa 100644
--- a/src/gui/ScrollBarWidget.hxx
+++ b/src/gui/ScrollBarWidget.hxx
@@ -23,7 +23,8 @@
 #ifndef SCROLL_BAR_WIDGET_HXX
 #define SCROLL_BAR_WIDGET_HXX
 
-#include "GuiObject.hxx"
+class GuiObject;
+
 #include "Widget.hxx"
 #include "Command.hxx"
 #include "bspf.hxx"
diff --git a/src/gui/UIDialog.hxx b/src/gui/UIDialog.hxx
index 44bac1edd..374f60ed5 100644
--- a/src/gui/UIDialog.hxx
+++ b/src/gui/UIDialog.hxx
@@ -31,8 +31,8 @@ class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
 class TabWidget;
+class OSystem;
 
-#include "OSystem.hxx"
 #include "bspf.hxx"
 
 class UIDialog : public Dialog
diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx
index 1f07abbe9..139a9a541 100644
--- a/src/gui/VideoDialog.cxx
+++ b/src/gui/VideoDialog.cxx
@@ -31,6 +31,7 @@
 #include "EditTextWidget.hxx"
 #include "PopUpWidget.hxx"
 #include "Console.hxx"
+#include "TIA.hxx"
 #include "Settings.hxx"
 #include "StringList.hxx"
 #include "Widget.hxx"
diff --git a/src/gui/VideoDialog.hxx b/src/gui/VideoDialog.hxx
index d82b6a134..197ec3117 100644
--- a/src/gui/VideoDialog.hxx
+++ b/src/gui/VideoDialog.hxx
@@ -31,8 +31,8 @@ class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
 class TabWidget;
+class OSystem;
 
-#include "OSystem.hxx"
 #include "Dialog.hxx"
 #include "bspf.hxx"
 
diff --git a/src/gui/Widget.hxx b/src/gui/Widget.hxx
index a000fccc6..346aa7a79 100644
--- a/src/gui/Widget.hxx
+++ b/src/gui/Widget.hxx
@@ -25,7 +25,7 @@
 #ifndef WIDGET_HXX
 #define WIDGET_HXX
 
-#include <assert.h>
+#include <cassert>
 
 #include "bspf.hxx"
 
diff --git a/src/macosx/OSystemMACOSX.hxx b/src/macosx/OSystemMACOSX.hxx
index af8d9dc33..116af9046 100644
--- a/src/macosx/OSystemMACOSX.hxx
+++ b/src/macosx/OSystemMACOSX.hxx
@@ -21,6 +21,7 @@
 #define OSYSTEM_MACOSX_HXX
 
 #include "bspf.hxx"
+#include "OSystem.hxx"
 
 
 /**
diff --git a/src/macosx/SettingsMACOSX.hxx b/src/macosx/SettingsMACOSX.hxx
index c0417aed7..8ac477ea2 100644
--- a/src/macosx/SettingsMACOSX.hxx
+++ b/src/macosx/SettingsMACOSX.hxx
@@ -1,59 +1,61 @@
-//============================================================================
-//
-//   SSSS    tt          lll  lll       
-//  SS  SS   tt           ll   ll        
-//  SS     tttttt  eeee   ll   ll   aaaa 
-//   SSSS    tt   ee  ee  ll   ll      aa
-//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
-//  SS  SS   tt   ee      ll   ll  aa  aa
-//   SSSS     ttt  eeeee llll llll  aaaaa
-//
-// Copyright (c) 1995-2010 by Bradford W. Mott, Stephen Anthony
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2010 by Bradford W. Mott, Stephen Anthony
 // and the Stella Team
-//
-// See the file "License.txt" for information on usage and redistribution of
-// this file, and for a DISCLAIMER OF ALL WARRANTIES.
-//
-// $Id$
-//============================================================================
-
-#ifndef SETTINGS_MAC_OSX_HXX
-#define SETTINGS_MAX_OSX_HXX
-
-class OSystem;
-
-/**
-  This class defines Macintosh OSX system specific settings.
-
-  @author  Mark Grebe
-  @version $Id$
-*/
-class SettingsMACOSX : public Settings
-{
-  public:
-    /**
-      Create a new UNIX settings object
-    */
-    SettingsMACOSX(OSystem* osystem);
-
-    /**
-      Destructor
-    */
-    virtual ~SettingsMACOSX();
-
-  public:
-	
-    /**
-      This method should be called to load the current settings from the 
-	  standard Mac preferences.
-    */
-    void loadConfig();
-
-    /**
-      This method should be called to save the current settings to the
-	  standard Mac preferences.
-    */
-    void saveConfig();
-};
-
-#endif
+//
+// See the file "License.txt" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id$
+//============================================================================
+
+#ifndef SETTINGS_MAC_OSX_HXX
+#define SETTINGS_MAX_OSX_HXX
+
+class OSystem;
+
+#include "Settings.hxx"
+
+/**
+  This class defines Macintosh OSX system specific settings.
+
+  @author  Mark Grebe
+  @version $Id$
+*/
+class SettingsMACOSX : public Settings
+{
+  public:
+    /**
+      Create a new UNIX settings object
+    */
+    SettingsMACOSX(OSystem* osystem);
+
+    /**
+      Destructor
+    */
+    virtual ~SettingsMACOSX();
+
+  public:
+	
+    /**
+      This method should be called to load the current settings from the 
+	  standard Mac preferences.
+    */
+    void loadConfig();
+
+    /**
+      This method should be called to save the current settings to the
+	  standard Mac preferences.
+    */
+    void saveConfig();
+};
+
+#endif
diff --git a/src/yacc/YaccParser.hxx b/src/yacc/YaccParser.hxx
index 0456eb859..0a6ebea0b 100644
--- a/src/yacc/YaccParser.hxx
+++ b/src/yacc/YaccParser.hxx
@@ -23,7 +23,7 @@
 #ifndef PARSER_HXX
 #define PARSER_HXX
 
-#include "Expression.hxx"
+class Expression;
 
 //#ifdef __cplusplus
 //extern "C" {