diff --git a/src/lay/layMainWindow.cc b/src/lay/layMainWindow.cc
index 422e7c963..ca633aaa5 100644
--- a/src/lay/layMainWindow.cc
+++ b/src/lay/layMainWindow.cc
@@ -69,10 +69,8 @@
 #include "laybasicConfig.h"
 #include "layConfig.h"
 #include "layMainWindow.h"
-#include "layMacroEditorDialog.h"
 #include "layHelpDialog.h"
 #include "layHelpSource.h" // because of escape_xml
-#include "layMacro.h"
 #include "layNavigator.h"
 #include "layProgress.h"
 #include "layProgressWidget.h"
@@ -96,6 +94,7 @@
 #include "layMacroController.h"
 #include "ui_HelpAboutDialog.h"
 #include "gsi.h"
+#include "gsiInterpreter.h"
 #include "gtf.h"
 
 namespace lay
diff --git a/src/lay/layMainWindow.h b/src/lay/layMainWindow.h
index 232a1df62..55bb7adb0 100644
--- a/src/lay/layMainWindow.h
+++ b/src/lay/layMainWindow.h
@@ -82,9 +82,6 @@ class CellView;
 class Navigator;
 class LayerToolbox;
 class MainWindow;
-class MacroEditorDialog;
-class MacroCollection;
-class Macro;
 class HelpDialog;
 
 /**