diff --git a/common/environment.c b/common/environment.c
index e11cd9dd4..9595986be 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -41,6 +41,13 @@
 #define EXPORT_SYMBOL(x)
 #endif
 
+struct action_data {
+	int fd;
+	const char *base;
+	void *writep;
+};
+#define PAD4(x) ((x + 3) & ~3)
+
 char *default_environment_path = "/dev/env0";
 
 int file_size_action(const char *filename, struct stat *statbuf,
diff --git a/include/environment.h b/include/environment.h
index 096c1697c..120040e0e 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -87,14 +87,6 @@ int file_save_action(const char *, struct stat *, void *, int);
 int envfs_load(char *filename, char *dirname, unsigned flags);
 int envfs_save(char *filename, char *dirname);
 
-/* This part is used for the host and the target */
-struct action_data {
-	int fd;
-	const char *base;
-	void *writep;
-};
-#define PAD4(x) ((x + 3) & ~3)
-
 #endif	/* _ENVIRONMENT_H_ */
 
 /**