diff --git a/log/include/ana/capfloat.h b/log/include/ana/capfloat.h
index 05196dad361540895d73e0d68d40ec558d117dc4..888e8446b81737deb0d3f613fdda256929106442 100644
--- a/log/include/ana/capfloat.h
+++ b/log/include/ana/capfloat.h
@@ -2,8 +2,8 @@
 #define CAPFLOAT_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/devtechn.h b/log/include/ana/devtechn.h
index fb04b895496ee576349da9cfaf1e36ff7636389f..f88c712b9f0d86286ea2388c14082900b4ffd08f 100644
--- a/log/include/ana/devtechn.h
+++ b/log/include/ana/devtechn.h
@@ -2,8 +2,8 @@
 #define DEVTECHN_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/devtechp.h b/log/include/ana/devtechp.h
index a728195126ff93d6763f5cd9ac4f09721ec1ecc1..46acff08340d8fe10f66ae9bae09a91738693208 100644
--- a/log/include/ana/devtechp.h
+++ b/log/include/ana/devtechp.h
@@ -2,8 +2,8 @@
 #define DEVTECHP_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/diode1.h b/log/include/ana/diode1.h
index 132915ea1c036b6a4a246d7421f6d66d3c72f5f3..23fde96b7e4f2ba58e295132c5b7dd8e5c91448f 100644
--- a/log/include/ana/diode1.h
+++ b/log/include/ana/diode1.h
@@ -2,7 +2,7 @@
 #define DIODE1_H
 
 #include "logdef.h"
-#include "globals.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/ganglion.h b/log/include/ana/ganglion.h
index 43a7c3d17a1eb0a7c18b29ca6e79be4a821c0560..32ed5f44b20062fefbfec62f8b8e57e531b27d0f 100644
--- a/log/include/ana/ganglion.h
+++ b/log/include/ana/ganglion.h
@@ -2,8 +2,8 @@
 #define GANGLION_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/hres.h b/log/include/ana/hres.h
index 0036cde2cd5a83a4ac58535147289517b9d86a5a..1e2c45afaabdfcdfec90aaa4822bf84a34cb0edf 100644
--- a/log/include/ana/hres.h
+++ b/log/include/ana/hres.h
@@ -2,8 +2,8 @@
 #define HRES_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/idiff.h b/log/include/ana/idiff.h
index 359a38a1c6c05394c7e9f90ecf3aac6eda48caba..1d896d1093f2255e7e48c90a737b48b89c91d2dc 100644
--- a/log/include/ana/idiff.h
+++ b/log/include/ana/idiff.h
@@ -3,8 +3,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/inter.h b/log/include/ana/inter.h
index 02f1800bd43084f179f05f5590a1acf074a09dc7..931ebad187b3ab2c6f90c4574479a590a04a2853 100644
--- a/log/include/ana/inter.h
+++ b/log/include/ana/inter.h
@@ -9,8 +9,8 @@
 #include <p2c/newasm.h>
 #include <p2c/mylib.h>
 #include "main.h"
-#include "globals.h"
-#include "nsolver.h"
+#include "ana/globals.h"
+#include "ana/nsolver.h"
 #include <p2c/newci.h>
 
 extern void Log_32_proc (log_action_t *act);
diff --git a/log/include/ana/iscope.h b/log/include/ana/iscope.h
index 6ca7ec2697c998a73bd443b45d58e7ae0c41e41d..bf10c1b2d8bee9191f7f3f09f29781fe5c0a1ac2 100644
--- a/log/include/ana/iscope.h
+++ b/log/include/ana/iscope.h
@@ -3,8 +3,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/iswitch1.h b/log/include/ana/iswitch1.h
index 8790fca78432588ea089a824aae59fc20bd22656..6a6c631bd1a866951b2f913695c4c4bd7ae2a133 100644
--- a/log/include/ana/iswitch1.h
+++ b/log/include/ana/iswitch1.h
@@ -4,8 +4,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/iswitch2.h b/log/include/ana/iswitch2.h
index e2fd485cdcb13728c451f61b2dbef0ecb99580d6..f1743f18f71f1b01e5ab3b0ae43d85eb8b7e7af3 100644
--- a/log/include/ana/iswitch2.h
+++ b/log/include/ana/iswitch2.h
@@ -3,8 +3,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/main.h b/log/include/ana/main.h
index e879ed9e14c63922d9cbf6dc41fefe8d681cf211..0245e040ed8f5e2a8bd32dd19aeb94034314c9ba 100644
--- a/log/include/ana/main.h
+++ b/log/include/ana/main.h
@@ -4,7 +4,7 @@
 
 #include <p2c/newci.h>
 #include <p2c/newcrt.h>
-#include "globals.h"
+#include "ana/globals.h"
 #include "logdef.h"
 #include <p2c/newasm.h>
 #include <p2c/mylib.h>
diff --git a/log/include/ana/mmeter.h b/log/include/ana/mmeter.h
index 72e8f37a9d09cf74a184bf58d8f9960f31d54728..375e32da715a03d6ff7c597c814c8bc3fec34631 100644
--- a/log/include/ana/mmeter.h
+++ b/log/include/ana/mmeter.h
@@ -4,8 +4,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/moscap.h b/log/include/ana/moscap.h
index 51cc66866c9af313b94e31e1157632e20da683c0..0f181c7f1aec5cd8b153a8010b9f08f4977e1d41 100644
--- a/log/include/ana/moscap.h
+++ b/log/include/ana/moscap.h
@@ -2,8 +2,8 @@
 #define MOSCAP_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/nfet4.h b/log/include/ana/nfet4.h
index e2a8222d71bd8d59c2d34bca037c86a9679ac01f..c2d4a003fb3ccc1d078fc60f85321efd993f2390 100644
--- a/log/include/ana/nfet4.h
+++ b/log/include/ana/nfet4.h
@@ -2,8 +2,8 @@
 #define NFET4_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/nfet5.h b/log/include/ana/nfet5.h
index 31645c891786697b8ecc8f08d46e5ad5987b32c6..76df5e219cc8316d2da1c7d86ab6a9cddc876655 100644
--- a/log/include/ana/nfet5.h
+++ b/log/include/ana/nfet5.h
@@ -3,8 +3,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/nfet7f.h b/log/include/ana/nfet7f.h
index 867e363cb8f626c2335da6f2d62ab20077a309b7..6c38f2608acf553c95f28e917f85231eab9d8a4e 100644
--- a/log/include/ana/nfet7f.h
+++ b/log/include/ana/nfet7f.h
@@ -2,8 +2,8 @@
 #define NFET7F_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/nfet7t.h b/log/include/ana/nfet7t.h
index 265f9527b88b2a5e371b8468c5d9ad05995a20c6..3db922437a964f2ee7137d60108b3b2250b0c014 100644
--- a/log/include/ana/nfet7t.h
+++ b/log/include/ana/nfet7t.h
@@ -2,8 +2,8 @@
 #define NFET7T_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/npn1.h b/log/include/ana/npn1.h
index 1bf6a9fee4d5a6bfe86a483be36589a89134c328..b4ef4bbe64aca6aaee715e9df6c3f443bc7cb435 100644
--- a/log/include/ana/npn1.h
+++ b/log/include/ana/npn1.h
@@ -2,8 +2,8 @@
 #define NPN1_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/npn2.h b/log/include/ana/npn2.h
index d9103491d460b314357acc24c4a0d4732573253d..c8a8b2579e44a03d2bdbc747d18e8e1c80eeecf9 100644
--- a/log/include/ana/npn2.h
+++ b/log/include/ana/npn2.h
@@ -2,8 +2,8 @@
 #define NPN2_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/nsolver.h b/log/include/ana/nsolver.h
index 85e5c0268a5382bbd505251d84f65013487ad79b..4d52ac99a4eb6d85b92238782fc5fc480c21fc92 100644
--- a/log/include/ana/nsolver.h
+++ b/log/include/ana/nsolver.h
@@ -2,7 +2,7 @@
 #define NSOLVER_H
 
 
-#include "globals.h"
+#include "ana/globals.h"
 #include "logdef.h"
 
 void Solve ();
diff --git a/log/include/ana/nspc1.h b/log/include/ana/nspc1.h
index 6b531c872f10407be6e8f0efe4cae94e7325cdda..21a46b3e4e32ee31581790d1b01e0d85705d0686 100644
--- a/log/include/ana/nspc1.h
+++ b/log/include/ana/nspc1.h
@@ -2,8 +2,8 @@
 #define NSPC1_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/numbers.h b/log/include/ana/numbers.h
index e3062ad0773fc9466bccda234ebf11f243812687..6a77a6af0c16733409a58ed435d95401b7d90d7d 100644
--- a/log/include/ana/numbers.h
+++ b/log/include/ana/numbers.h
@@ -2,8 +2,8 @@
 #define NUMBERS_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pfet4.h b/log/include/ana/pfet4.h
index 72984ce23b9662c7e4576d0cf65ea34919e719cf..b169b9d872c027b81dc51252f77793e678faa207 100644
--- a/log/include/ana/pfet4.h
+++ b/log/include/ana/pfet4.h
@@ -3,8 +3,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pfet5.h b/log/include/ana/pfet5.h
index 92328a877ef8dabb718d9edaa1f850920921ad3a..d500e06aa71b633075f9018942e866ffb6b6c53d 100644
--- a/log/include/ana/pfet5.h
+++ b/log/include/ana/pfet5.h
@@ -2,8 +2,8 @@
 #define PFET5_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pfet6.h b/log/include/ana/pfet6.h
index f0aabf0188bcb602f9b1120d0ff3f62ee17a586f..f7ae2286544c17ee0118eb3d2352f0cfd5faa914 100644
--- a/log/include/ana/pfet6.h
+++ b/log/include/ana/pfet6.h
@@ -3,8 +3,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pfet7f.h b/log/include/ana/pfet7f.h
index ae173c0b2d5c25d36d96b9b47936d7e503d9628d..f1032f4f6e49695a348092923e60f482359c0474 100644
--- a/log/include/ana/pfet7f.h
+++ b/log/include/ana/pfet7f.h
@@ -2,8 +2,8 @@
 #define PFET7F_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pfet7t.h b/log/include/ana/pfet7t.h
index 3e50bb3f1fa90e6496c42c93b064ad427da6be35..96d5c8813d03797e926aa46c323df94838f8f774 100644
--- a/log/include/ana/pfet7t.h
+++ b/log/include/ana/pfet7t.h
@@ -2,8 +2,8 @@
 #define PFET7T_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/physical.h b/log/include/ana/physical.h
index 898443abaa5d249ab37a4bd56853a299c9977fb7..cf3240969f1105af06295a3154c07fced1240efd 100644
--- a/log/include/ana/physical.h
+++ b/log/include/ana/physical.h
@@ -2,8 +2,8 @@
 #define PHYSICAL_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pnp1.h b/log/include/ana/pnp1.h
index 4de669ec3c9cbc280a80b109aa4812151250225d..b13c62556ec3ba26529f8171b688b6b18a3f7e35 100644
--- a/log/include/ana/pnp1.h
+++ b/log/include/ana/pnp1.h
@@ -2,8 +2,8 @@
 #define PNP1_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pnp2.h b/log/include/ana/pnp2.h
index 86c04c37fa700b0d7a0b8e5a6ed8dd3ffefff1bf..92596dffb81d17ff7021bb9421fb26862b4ccf10 100644
--- a/log/include/ana/pnp2.h
+++ b/log/include/ana/pnp2.h
@@ -2,8 +2,8 @@
 #define PNP2_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pspc1.h b/log/include/ana/pspc1.h
index af5e68ab5e2cc236ae49e7edd0d2d35fe406b4ef..e28e3d427d6d909da1ea4dabee7bb5c1f6a870c6 100644
--- a/log/include/ana/pspc1.h
+++ b/log/include/ana/pspc1.h
@@ -2,8 +2,8 @@
 #define PSPC1_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/pwl.h b/log/include/ana/pwl.h
index 67b1437f4b5e75b8c419d6728e628228392d02fa..72d36487583bf69c46eb9ab2e17020856bc18058 100644
--- a/log/include/ana/pwl.h
+++ b/log/include/ana/pwl.h
@@ -2,8 +2,8 @@
 #define PWL_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/resfloat.h b/log/include/ana/resfloat.h
index 7883636ed802304b8138948d055a5a366b61e882..b6d1dfc48b94b0231398112dedfc6f5379447baf 100644
--- a/log/include/ana/resfloat.h
+++ b/log/include/ana/resfloat.h
@@ -4,8 +4,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/rtd.h b/log/include/ana/rtd.h
index 75d2ea57b240a38558dead7cdb5a5da972147053..97076b68273832c645153756d6259aa08d47f00e 100644
--- a/log/include/ana/rtd.h
+++ b/log/include/ana/rtd.h
@@ -2,8 +2,8 @@
 #define RTD_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/runspec.h b/log/include/ana/runspec.h
index 861fdf1397c06395dacae6d082dca7c307cf407b..84e18b6ef52dc4122edf6a737f7524c0138b7fb7 100644
--- a/log/include/ana/runspec.h
+++ b/log/include/ana/runspec.h
@@ -2,8 +2,8 @@
 #define RUNSPEC_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/stairs.h b/log/include/ana/stairs.h
index efe361fa18dc0b249964703993c173c234cbc97d..75de4c081fc156ea0ed12f74afc4e0793050403b 100644
--- a/log/include/ana/stairs.h
+++ b/log/include/ana/stairs.h
@@ -3,8 +3,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/tc.h b/log/include/ana/tc.h
index 933989740db9930a873aea2b86de43a6ba4ea695..84bdfef33a0045b459c8d2d9dd3ad185ceb4e82a 100644
--- a/log/include/ana/tc.h
+++ b/log/include/ana/tc.h
@@ -2,8 +2,8 @@
 #define TC_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/thermal.h b/log/include/ana/thermal.h
index e1152cb485b08119f4c544505d8cc662f40450cc..d21b80c31f25702513a26a43b3a1e467d21954cd 100644
--- a/log/include/ana/thermal.h
+++ b/log/include/ana/thermal.h
@@ -2,8 +2,8 @@
 #define THERMAL_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/vdiff.h b/log/include/ana/vdiff.h
index 610ea18f604c4ddef79ce74a0ac86f2696be0b05..7ae164693406f5960f75509d51062bd684a01eae 100644
--- a/log/include/ana/vdiff.h
+++ b/log/include/ana/vdiff.h
@@ -4,8 +4,8 @@
 
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>
diff --git a/log/include/ana/vswitch.h b/log/include/ana/vswitch.h
index ba34358c7061ae70844c6ec2b7f9f50bfb6565d8..ddc3e902916b61eb88efb1318adf822c6a3b26c8 100644
--- a/log/include/ana/vswitch.h
+++ b/log/include/ana/vswitch.h
@@ -3,8 +3,8 @@
 #define VSWITCH_H
 
 #include "logdef.h"
-#include "nsolver.h"
-#include "globals.h"
+#include "ana/nsolver.h"
+#include "ana/globals.h"
 #include <p2c/mylib.h>
 #include <p2c/newasm.h>
 #include <p2c/sysglobals.h>