summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am2
-rw-r--r--src/bbwindow.cc2
-rw-r--r--src/blackbox.cc2
-rw-r--r--src/screen.cc2
-rw-r--r--src/workspace.cc2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 065efbb4..19306b3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS= openbox
openbox_LDADD=../otk/libotk.a @LIBINTL@
openbox_SOURCES= configuration.cc screen.cc openbox.cc \
- util.cc window.cc workspace.cc xatom.cc blackbox.cc \
+ util.cc bbwindow.cc workspace.cc xatom.cc blackbox.cc \
main.cc xeventhandler.cc
MAINTAINERCLEANFILES= Makefile.in
diff --git a/src/bbwindow.cc b/src/bbwindow.cc
index 17c53966..64a6b25a 100644
--- a/src/bbwindow.cc
+++ b/src/bbwindow.cc
@@ -29,7 +29,7 @@ extern "C" {
#include "image.hh"
#include "screen.hh"
#include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
#include "workspace.hh"
using std::string;
diff --git a/src/blackbox.cc b/src/blackbox.cc
index a6a0b9f8..ca6ac814 100644
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -81,7 +81,7 @@ using std::string;
#include "otk/assassin.hh"
#include "screen.hh"
#include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
#include "workspace.hh"
#include "xatom.hh"
diff --git a/src/screen.cc b/src/screen.cc
index f8b998e6..4afe22a5 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -61,7 +61,7 @@ using std::string;
#include "otk/assassin.hh"
#include "openbox.hh"
#include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
#include "workspace.hh"
#include "util.hh"
#include "xatom.hh"
diff --git a/src/workspace.cc b/src/workspace.cc
index 5259f3a5..ab209b0e 100644
--- a/src/workspace.cc
+++ b/src/workspace.cc
@@ -29,7 +29,7 @@ using std::string;
#include "otk/display.hh"
#include "screen.hh"
#include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
#include "workspace.hh"
#include "xatom.hh"