are we going to have state implemented just by mistake?

world/net/spyc/circuit.c

@@ -3,10 +3,6 @@
 
 #include "psyc.h"
 
-#ifdef USE_PSYC
-# include "../psyc/circuit.c"
-#else
-
 #include <net.h>
 #include <uniform.h>
 #include <tls.h>
@@ -302,4 +298,3 @@ varargs int msg(string source, string mc, string data,
     return emit(buf);
 }
 
-#endif // USE_PSYC

world/net/spyc/common.h

@@ -1,3 +0,0 @@
-#ifdef USE_PSYC
-# include "../psyc/common.h"
-#endif

world/net/spyc/parse.c

@@ -1,8 +1,6 @@
 // vim:foldmethod=marker:syntax=lpc:noexpandtab
 // $Id: parse.c,v 1.30 2008/12/18 18:16:14 lynx Exp $
 
-#ifndef USE_PSYC
-
 #include "psyc.h"
 #include <net.h>
 #include <input_to.h>
@@ -468,5 +466,3 @@ void interrupt_parse() {
 void resume_parse() {
     state = PSYCPARSE_STATE_HEADER;
 }
-
-#endif // USE_PSYC

world/net/spyc/psyc.h

@@ -23,12 +23,11 @@
  * the first byte.
  */
 
+#ifndef SPYC
 #define SPYC
 
 #include <psyc.h>
 
-#ifndef USE_PSYC
-
 #if __EFUN_DEFINED__(psyc_parse)
 # define LIBPSYC
 # include <sys/libpsyc.h>
@@ -46,4 +45,4 @@
     return;                                           \
 }
 
-#endif // USE_PSYC
+#endif // SPYC

world/net/spyc/server.c

@@ -5,10 +5,6 @@
 
 #include "psyc.h"
 
-#ifdef USE_PSYC
-# include "../psyc/server.c"
-#else
-
 #include <net.h>
 #include <services.h>
 #define NO_INHERIT
@@ -195,4 +191,3 @@ void circuit_msg(string mc, mapping vars, string data) {
     }
 }
 
-#endif // USE_PSYC

world/net/spyc/udp.c

@@ -3,10 +3,6 @@
 
 #include "psyc.h"
 
-#ifdef USE_PSYC
-# include "../psyc/udp.c"
-#else
-
 #include <net.h>
 #include <uniform.h>
 #include <text.h>
@@ -42,5 +38,3 @@ parseUDP(ip, port, msg) {
 // ignoring the routing vars.. TODO FIXME
 #define PSYC_UDP
 #include "dispatch.i"
-
-#endif // USE_PSYC