avoid circular dependency by moving modes/modes.h to modes.h

.hgignore

@@ -2,4 +2,4 @@ glob:.scons*
 glob:*.o
 glob:dwss
 glob:LoadFile-gen.inc
-^modes/modes.h$
+^modes.h$

SConstruct

@@ -23,7 +23,7 @@ sources = [Glob('*.c'), Glob('*.cc'), Glob('LoadFile/*.cc')]
 env.LoadFile('LoadFile-gen.inc', load_files)
 env.Depends('LoadFile-gen.inc', 'genLoadFile.pl')
 
-env.Modes('modes/modes.h', Glob('modes/*.h'))
+env.Modes('modes.h', Glob('modes/*.h'))
 
 dwss = env.Program('dwss', sources)
 

dwss.cc

@@ -9,7 +9,7 @@
 #include <GL/glu.h>
 
 #include "GnomeScreensaver.h"
-#include "modes/modes.h"
+#include "modes.h"
 
 using namespace std;