X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fexpressions%2Foptimize.c;h=8f090778ab9c80a20fc6f44a24e7a7ba5b5d21aa;hb=d8fdf0b4fa919e48397b438e9453d6b82215ff51;hp=b0abd946c57b9868b6346f77d45d68cf5a45ccc3;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp
diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c
index b0abd946c5..8f090778ab 100644
--- a/src/language/expressions/optimize.c
+++ b/src/language/expressions/optimize.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,24 +15,27 @@
along with this program. If not, see . */
#include
-#include "private.h"
+
+#include "language/expressions/private.h"
+
#include
#include
#include
#include
-#include
-#include
-#include
-#include
-#include "evaluate.h"
-#include "helpers.h"
-#include
-#include
-#include "public.h"
-#include
-#include
-
-#include "xalloc.h"
+
+#include "data/calendar.h"
+#include "data/data-in.h"
+#include "data/variable.h"
+#include "language/expressions/evaluate.h"
+#include "language/expressions/helpers.h"
+#include "language/expressions/public.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
static union any_node *evaluate_tree (struct composite_node *,
struct expression *);